diff options
| author | Vinit Deshpande <vinitd@google.com> | 2014-10-23 16:34:04 -0700 |
|---|---|---|
| committer | The Android Automerger <android-build@google.com> | 2014-10-24 16:05:28 -0700 |
| commit | 11116da6bceae3759f9f2d75cd412fce541fc001 (patch) | |
| tree | 46b3b7ed9d645f27ec2d16de8cc787807b67931b | |
| parent | 44d0d289bc2a959a18af3870844d221c93301659 (diff) | |
| download | wifi-lollipop-release.tar.gz | |
Mark configuration as disabled, if it is disabled by WifiManagerandroid-cts-5.0_r9android-cts-5.0_r8android-cts-5.0_r7android-cts-5.0_r6android-cts-5.0_r5android-cts-5.0_r4android-cts-5.0_r3android-5.0.2_r3android-5.0.2_r1android-5.0.1_r1android-5.0.0_r7android-5.0.0_r6android-5.0.0_r5.1android-5.0.0_r5android-5.0.0_r4android-5.0.0_r3android-5.0.0_r2android-5.0.0_r1lollipop-releaselollipop-cts-release
Bug: 17937171
Change-Id: Ic61439868f28899cc1c641c29ebcc8b7bfab35eb
| -rw-r--r-- | service/java/com/android/server/wifi/WifiConfigStore.java | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/service/java/com/android/server/wifi/WifiConfigStore.java b/service/java/com/android/server/wifi/WifiConfigStore.java index b9e6c80ad..cb48ab1aa 100644 --- a/service/java/com/android/server/wifi/WifiConfigStore.java +++ b/service/java/com/android/server/wifi/WifiConfigStore.java @@ -1186,6 +1186,7 @@ public class WifiConfigStore extends IpConfigStore { if (reason == WifiConfiguration.DISABLED_BY_WIFI_MANAGER) { // Make sure autojoin wont reenable this configuration without further user // intervention + config.status = Status.DISABLED; config.autoJoinStatus = WifiConfiguration.AUTO_JOIN_DISABLED_USER_ACTION; } if (network != null) { |