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

Fix not updating error message when authentication fails

Browse Source 
If attempt to configure the first network fails, AccessPoints fails to
update error message because it only checks the error code if it is not
active.

With this change, user may see saved network message for a second
because SupplicantStateTracker retries on authentication failure so
intermediate status is displayed between each trial.

Bug: 8284024
Change-Id: I8b976b03878e27e46726ee8a176f131115b7a409
This commit is contained in:
Jaewan Kim
2013-02-28 20:50:21 +09:00
parent 29a4eb7a33
commit 0085de7999
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -338,11 +338,7 @@ class AccessPoint extends Preference {
setTitle(ssid); setTitle(ssid);
Context context = getContext(); Context context = getContext();
if (mState != null) { // This is the active connection if (mConfig != null && mConfig.status == WifiConfiguration.Status.DISABLED) {
setSummary(Summary.get(context, mState));
} else if (mRssi == Integer.MAX_VALUE) { // Wifi out of range
setSummary(context.getString(R.string.wifi_not_in_range));
} else if (mConfig != null && mConfig.status == WifiConfiguration.Status.DISABLED) {
switch (mConfig.disableReason) { switch (mConfig.disableReason) {
case WifiConfiguration.DISABLED_AUTH_FAILURE: case WifiConfiguration.DISABLED_AUTH_FAILURE:
setSummary(context.getString(R.string.wifi_disabled_password_failure)); setSummary(context.getString(R.string.wifi_disabled_password_failure));
@@ -354,6 +350,10 @@ class AccessPoint extends Preference {
case WifiConfiguration.DISABLED_UNKNOWN_REASON: case WifiConfiguration.DISABLED_UNKNOWN_REASON:
setSummary(context.getString(R.string.wifi_disabled_generic)); setSummary(context.getString(R.string.wifi_disabled_generic));
} }
} else if (mRssi == Integer.MAX_VALUE) { // Wifi out of range
setSummary(context.getString(R.string.wifi_not_in_range));
} else if (mState != null) { // This is the active connection
setSummary(Summary.get(context, mState));
} else { // In range, not disabled. } else { // In range, not disabled.
StringBuilder summary = new StringBuilder(); StringBuilder summary = new StringBuilder();
if (mConfig != null) { // Is saved network if (mConfig != null) { // Is saved network