From eb3d14651eda252a6a0475dfa8eacfb120b80939 Mon Sep 17 00:00:00 2001 From: yinxu Date: Wed, 31 Mar 2021 13:31:23 -0700 Subject: [PATCH] Remove the main thread blocking call to get SSID WifiManager#getConfiguredNetworks is a blocking call which may cause main thread ANR, and the platform team also confirmed it is no longer necessary to retrieve the SSID. Bug: 183202291 Test: Unit tests Change-Id: I089148cdb9900d7dc292dc8fc6d6f17302088e43 --- .../com/android/settingslib/wifi/WifiStatusTracker.java | 9 --------- 1 file changed, 9 deletions(-) diff --git a/packages/SettingsLib/src/com/android/settingslib/wifi/WifiStatusTracker.java b/packages/SettingsLib/src/com/android/settingslib/wifi/WifiStatusTracker.java index 41ccb16f03749..2c2ca3becd4a8 100644 --- a/packages/SettingsLib/src/com/android/settingslib/wifi/WifiStatusTracker.java +++ b/packages/SettingsLib/src/com/android/settingslib/wifi/WifiStatusTracker.java @@ -26,7 +26,6 @@ import android.net.NetworkKey; import android.net.NetworkRequest; import android.net.NetworkScoreManager; import android.net.ScoredNetwork; -import android.net.wifi.WifiConfiguration; import android.net.wifi.WifiInfo; import android.net.wifi.WifiManager; import android.net.wifi.WifiNetworkScoreCache; @@ -346,14 +345,6 @@ public class WifiStatusTracker { if (ssid != null && !WifiManager.UNKNOWN_SSID.equals(ssid)) { return ssid; } - // OK, it's not in the connectionInfo; we have to go hunting for it - List networks = mWifiManager.getConfiguredNetworks(); - int length = networks.size(); - for (int i = 0; i < length; i++) { - if (networks.get(i).networkId == info.getNetworkId()) { - return networks.get(i).SSID; - } - } return null; }