From d42ec37dbfdfb8a63c7929978489d050d38f463b Mon Sep 17 00:00:00 2001 From: vandwalle Date: Tue, 10 Jun 2014 20:47:19 -0700 Subject: [PATCH] remove disbaled for unknown reason status Change-Id: Id9fda1b6aeec8e7122a5c00996e5afbec20ac1cb --- src/com/android/settings/wifi/AccessPoint.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/com/android/settings/wifi/AccessPoint.java b/src/com/android/settings/wifi/AccessPoint.java index 5c6ea1cce6e..b8765bba43f 100644 --- a/src/com/android/settings/wifi/AccessPoint.java +++ b/src/com/android/settings/wifi/AccessPoint.java @@ -469,7 +469,8 @@ class AccessPoint extends Preference { if (mState != null) { // This is the active connection summary.append(Summary.get(context, mState)); - } else if (mConfig != null && (mConfig.status == WifiConfiguration.Status.DISABLED + } else if (mConfig != null && ((mConfig.status == WifiConfiguration.Status.DISABLED && + mConfig.disableReason != WifiConfiguration.DISABLED_UNKNOWN_REASON) || mConfig.autoJoinStatus >= WifiConfiguration.AUTO_JOIN_DISABLED_ON_AUTH_FAILURE)) { if (mConfig.autoJoinStatus >= WifiConfiguration.AUTO_JOIN_DISABLED_ON_AUTH_FAILURE) { summary.append(context.getString(R.string.wifi_disabled_password_failure)); @@ -483,6 +484,8 @@ class AccessPoint extends Preference { summary.append(context.getString(R.string.wifi_disabled_network_failure)); break; case WifiConfiguration.DISABLED_UNKNOWN_REASON: + //this state is not useful anymore as auto-join may attempt joining + //those networks summary.append(context.getString(R.string.wifi_disabled_generic)); } }