Merge "Remove InterfaceState and Role @IntDef from TetheredSettings."

This commit is contained in:
Xiao Ma
2022-03-04 08:00:01 +00:00
committed by Gerrit Code Review

View File

@@ -34,8 +34,6 @@ import android.content.IntentFilter;
import android.hardware.usb.UsbManager; import android.hardware.usb.UsbManager;
import android.net.ConnectivityManager; import android.net.ConnectivityManager;
import android.net.EthernetManager; import android.net.EthernetManager;
import android.net.EthernetManager.InterfaceState;
import android.net.EthernetManager.Role;
import android.net.IpConfiguration; import android.net.IpConfiguration;
import android.net.TetheringManager; import android.net.TetheringManager;
import android.net.wifi.WifiManager; import android.net.wifi.WifiManager;
@@ -650,8 +648,8 @@ public class TetherSettings extends RestrictedSettingsFragment
} }
private final class EthernetListener implements EthernetManager.InterfaceStateListener { private final class EthernetListener implements EthernetManager.InterfaceStateListener {
public void onInterfaceStateChanged(@NonNull String iface, @InterfaceState int state, public void onInterfaceStateChanged(@NonNull String iface, int state, int role,
@Role int role, @NonNull IpConfiguration configuration) { @NonNull IpConfiguration configuration) {
if (state == EthernetManager.STATE_LINK_UP) { if (state == EthernetManager.STATE_LINK_UP) {
mAvailableInterfaces.add(iface); mAvailableInterfaces.add(iface);
} else { } else {