From f1414529a749e58d4452ea567e48ad147929fd8f Mon Sep 17 00:00:00 2001 From: David Su Date: Tue, 26 Nov 2019 18:22:54 -0800 Subject: [PATCH] Stop using IWifiManager in AccessPoint IWifiManager is @hide, cannot be used outside of Wifi module. Bug: 138801922 Test: compiles Change-Id: If1d38fe18d1f334d7b039990615c870a2b1c2248 --- .../src/com/android/settingslib/wifi/AccessPoint.java | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/packages/SettingsLib/src/com/android/settingslib/wifi/AccessPoint.java b/packages/SettingsLib/src/com/android/settingslib/wifi/AccessPoint.java index f2af40e3d93f9..b0bdf1dd85942 100644 --- a/packages/SettingsLib/src/com/android/settingslib/wifi/AccessPoint.java +++ b/packages/SettingsLib/src/com/android/settingslib/wifi/AccessPoint.java @@ -33,7 +33,6 @@ import android.net.NetworkKey; import android.net.NetworkScoreManager; import android.net.NetworkScorerAppData; import android.net.ScoredNetwork; -import android.net.wifi.IWifiManager; import android.net.wifi.ScanResult; import android.net.wifi.WifiConfiguration; import android.net.wifi.WifiConfiguration.KeyMgmt; @@ -47,7 +46,6 @@ import android.net.wifi.hotspot2.ProvisioningCallback; import android.os.Bundle; import android.os.Parcelable; import android.os.RemoteException; -import android.os.ServiceManager; import android.os.SystemClock; import android.os.UserHandle; import android.provider.Settings; @@ -1612,13 +1610,8 @@ public class AccessPoint implements Comparable { final ConnectivityManager cm = (ConnectivityManager) context.getSystemService(Context.CONNECTIVITY_SERVICE); if (state == DetailedState.CONNECTED) { - IWifiManager wifiManager = IWifiManager.Stub.asInterface( - ServiceManager.getService(Context.WIFI_SERVICE)); - NetworkCapabilities nc = null; - - try { - nc = cm.getNetworkCapabilities(wifiManager.getCurrentNetwork()); - } catch (RemoteException e) {} + WifiManager wifiManager = context.getSystemService(WifiManager.class); + NetworkCapabilities nc = cm.getNetworkCapabilities(wifiManager.getCurrentNetwork()); if (nc != null) { if (nc.hasCapability(nc.NET_CAPABILITY_CAPTIVE_PORTAL)) {