diff options
| author | Roshan Pius <rpius@google.com> | 2018-05-16 21:47:15 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2018-05-16 21:47:15 +0000 |
| commit | 514a1fbaca27f86221279b841a0617b43db18a7e (patch) | |
| tree | fe0c5fb8981d3e59d478c74e75e543e2cd033cb2 | |
| parent | 8964a106164d84089c1ee52b62973c346115822b (diff) | |
| parent | 35b49ffad94e7e7d7769db2a4aea0057640165fa (diff) | |
Merge "WifiConfigManager: Explcitly set the disable reason for new networks" into pi-dev
| -rw-r--r-- | service/java/com/android/server/wifi/WifiConfigManager.java | 2 | ||||
| -rw-r--r-- | tests/wifitests/src/com/android/server/wifi/WifiConfigManagerTest.java | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/service/java/com/android/server/wifi/WifiConfigManager.java b/service/java/com/android/server/wifi/WifiConfigManager.java index 336ebbd16..982c48a48 100644 --- a/service/java/com/android/server/wifi/WifiConfigManager.java +++ b/service/java/com/android/server/wifi/WifiConfigManager.java @@ -898,6 +898,8 @@ public class WifiConfigManager { configuration.status = WifiConfiguration.Status.DISABLED; configuration.getNetworkSelectionStatus().setNetworkSelectionStatus( NetworkSelectionStatus.NETWORK_SELECTION_PERMANENTLY_DISABLED); + configuration.getNetworkSelectionStatus().setNetworkSelectionDisableReason( + NetworkSelectionStatus.DISABLED_BY_WIFI_MANAGER); } /** diff --git a/tests/wifitests/src/com/android/server/wifi/WifiConfigManagerTest.java b/tests/wifitests/src/com/android/server/wifi/WifiConfigManagerTest.java index 4cccc88c9..844a358d0 100644 --- a/tests/wifitests/src/com/android/server/wifi/WifiConfigManagerTest.java +++ b/tests/wifitests/src/com/android/server/wifi/WifiConfigManagerTest.java @@ -3607,6 +3607,8 @@ public class WifiConfigManagerTest { configuration.status = WifiConfiguration.Status.DISABLED; configuration.getNetworkSelectionStatus().setNetworkSelectionStatus( NetworkSelectionStatus.NETWORK_SELECTION_PERMANENTLY_DISABLED); + configuration.getNetworkSelectionStatus().setNetworkSelectionDisableReason( + NetworkSelectionStatus.DISABLED_BY_WIFI_MANAGER); } /** |