commit 60dfd4e89f53d9928e8f5f09609935fa3c88a081
author Xiao Ma <xiaom@google.com> Fri Mar 04 08:41:05 2022 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Fri Mar 04 08:41:05 2022 +0000
tree c86f2f443cfb186b9e36f08b10d60d43b07a670e
parent e39120e45c2476f3ea018e71ba7c4b947d6b999b
parent 39bc6f906f2efa2cd21b1e9ee35f0159df505a40

Merge "Remove InterfaceState and Role @IntDef from TetheredSettings." am: ebebc5e1e9 am: 39bc6f906f

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2007411

Change-Id: I87aa662e232eff08faa456b1de2507683684b564

src/com/android/settings/TetherSettings.java

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 {