diff options
| author | Ningyuan Wang <nywang@google.com> | 2017-09-25 14:46:38 -0700 |
|---|---|---|
| committer | Ningyuan Wang <nywang@google.com> | 2017-09-29 09:58:28 -0700 |
| commit | 2f5d10a29d17781e903eeddedb4a547e62c55524 (patch) | |
| tree | 19eae9d98dafe28929f51b738a182807db994170 /service | |
| parent | 75dc8a494a00a37d19772220fdc639abc05ea3d0 (diff) | |
| download | android_frameworks_opt_net_wifi-2f5d10a29d17781e903eeddedb4a547e62c55524.tar.gz android_frameworks_opt_net_wifi-2f5d10a29d17781e903eeddedb4a547e62c55524.tar.bz2 android_frameworks_opt_net_wifi-2f5d10a29d17781e903eeddedb4a547e62c55524.zip | |
Cherry-pick: Remove temporarily disabled networks from PNO list
This also adds corresponding unit tests.
Bug: 66910426
Test: compile, unit tests
Merged-In: I58f7061887ebc1dd78d3941218653460f80abb1f
Change-Id: I58f7061887ebc1dd78d3941218653460f80abb1f
Diffstat (limited to 'service')
| -rw-r--r-- | service/java/com/android/server/wifi/WifiConfigManager.java | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/service/java/com/android/server/wifi/WifiConfigManager.java b/service/java/com/android/server/wifi/WifiConfigManager.java index 75b39b261..06b53be85 100644 --- a/service/java/com/android/server/wifi/WifiConfigManager.java +++ b/service/java/com/android/server/wifi/WifiConfigManager.java @@ -2330,12 +2330,13 @@ public class WifiConfigManager { public List<WifiScanner.PnoSettings.PnoNetwork> retrievePnoNetworkList() { List<WifiScanner.PnoSettings.PnoNetwork> pnoList = new ArrayList<>(); List<WifiConfiguration> networks = new ArrayList<>(getInternalConfiguredNetworks()); - // Remove any permanently disabled networks. + // Remove any permanently or temporarily disabled networks. Iterator<WifiConfiguration> iter = networks.iterator(); while (iter.hasNext()) { WifiConfiguration config = iter.next(); if (config.ephemeral || config.isPasspoint() - || config.getNetworkSelectionStatus().isNetworkPermanentlyDisabled()) { + || config.getNetworkSelectionStatus().isNetworkPermanentlyDisabled() + || config.getNetworkSelectionStatus().isNetworkTemporaryDisabled()) { iter.remove(); } } |