commit 11116da6bceae3759f9f2d75cd412fce541fc001
author Vinit Deshpande <vinitd@google.com> Thu Oct 23 16:34:04 2014 -0700
committer The Android Automerger <android-build@google.com> Fri Oct 24 16:05:28 2014 -0700
tree 46b3b7ed9d645f27ec2d16de8cc787807b67931b
parent 44d0d289bc2a959a18af3870844d221c93301659

Mark configuration as disabled, if it is disabled by WifiManager

Bug: 17937171

Change-Id: Ic61439868f28899cc1c641c29ebcc8b7bfab35eb

service/java/com/android/server/wifi/WifiConfigStore.java

diff --git a/service/java/com/android/server/wifi/WifiConfigStore.java b/service/java/com/android/server/wifi/WifiConfigStore.java
index b9e6c80..cb48ab1 100644
--- a/service/java/com/android/server/wifi/WifiConfigStore.java
+++ b/service/java/com/android/server/wifi/WifiConfigStore.java
@@ -1186,6 +1186,7 @@
         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) {