Merge "Fix not updating error message when authentication fails" (ba6a68c8) · Commits · e / os / android_packages_apps_Settings

src/com/android/settings/wifi/AccessPoint.java

+5 −5

Original line number	Diff line number	Diff line
		@@ -338,11 +338,7 @@ class AccessPoint extends Preference {
		setTitle(ssid);

		Context context = getContext();
		if (mState != null) { // This is the active connection
		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) {
		if (mConfig != null && mConfig.status == WifiConfiguration.Status.DISABLED) {
		switch (mConfig.disableReason) {
		case WifiConfiguration.DISABLED_AUTH_FAILURE:
		setSummary(context.getString(R.string.wifi_disabled_password_failure));
		@@ -354,6 +350,10 @@ class AccessPoint extends Preference {
		case WifiConfiguration.DISABLED_UNKNOWN_REASON:
		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.
		StringBuilder summary = new StringBuilder();
		if (mConfig != null) { // Is saved network