PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

remove disbaled for unknown reason status

Browse Source 
Change-Id: Id9fda1b6aeec8e7122a5c00996e5afbec20ac1cb
This commit is contained in:
vandwalle
2014-06-10 20:47:19 -07:00
parent 7d7c0db55d
commit d42ec37dbf
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/com/android/settings/wifi/AccessPoint.java
View File

@@ -469,7 +469,8 @@ class AccessPoint extends Preference {
if (mState != null) { // This is the active connection if (mState != null) { // This is the active connection
summary.append(Summary.get(context, mState)); 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)) { || mConfig.autoJoinStatus >= WifiConfiguration.AUTO_JOIN_DISABLED_ON_AUTH_FAILURE)) {
if (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)); 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)); summary.append(context.getString(R.string.wifi_disabled_network_failure));
break; break;
case WifiConfiguration.DISABLED_UNKNOWN_REASON: 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)); summary.append(context.getString(R.string.wifi_disabled_generic));
} }
} }