From bb0a8f2523ce760b1461825b0681a3ba125225f8 Mon Sep 17 00:00:00 2001 From: Xiao Ma Date: Fri, 4 Mar 2022 06:09:33 +0000 Subject: [PATCH] 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 --- src/com/android/settings/TetherSettings.java | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/com/android/settings/TetherSettings.java b/src/com/android/settings/TetherSettings.java index ae2416824bd..da21729d72e 100644 --- a/src/com/android/settings/TetherSettings.java +++ b/src/com/android/settings/TetherSettings.java @@ -34,8 +34,6 @@ import android.content.IntentFilter; 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 @@ public class TetherSettings extends RestrictedSettingsFragment } 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 {