Remove InterfaceState and Role @IntDef from TetheredSettings.
@InterfaceState and @Role won't be exposed as module-lib APIs from
EthernetManager after migration, which are not visible for Settings
code, remove them as well.
Bug: 210586283
Test: m Settings
Change-Id: I49f0e8401681e66d6f5853c8eb3205fcef803c25
diff --git a/src/com/android/settings/TetherSettings.java b/src/com/android/settings/TetherSettings.java
index ae24168..da21729 100644
--- a/src/com/android/settings/TetherSettings.java
+++ b/src/com/android/settings/TetherSettings.java
@@ -34,8 +34,6 @@
import android.hardware.usb.UsbManager;
import android.net.ConnectivityManager;
import android.net.EthernetManager;
-import android.net.EthernetManager.InterfaceState;
-import android.net.EthernetManager.Role;
import android.net.IpConfiguration;
import android.net.TetheringManager;
import android.net.wifi.WifiManager;
@@ -650,8 +648,8 @@
}
private final class EthernetListener implements EthernetManager.InterfaceStateListener {
- public void onInterfaceStateChanged(@NonNull String iface, @InterfaceState int state,
- @Role int role, @NonNull IpConfiguration configuration) {
+ public void onInterfaceStateChanged(@NonNull String iface, int state, int role,
+ @NonNull IpConfiguration configuration) {
if (state == EthernetManager.STATE_LINK_UP) {
mAvailableInterfaces.add(iface);
} else {