Merge "sanitize strings and error messages in wiFi picker" into lmp-mr1-dev (508a693c) · Commits · e / os / android_packages_apps_Settings

res/values/strings.xml

+5 −1

Original line number	Diff line number	Diff line
		@@ -1598,12 +1598,16 @@
		<!-- Status for networks disabled for unknown reason -->
		<string name="wifi_disabled_generic">Disabled</string>
		<!-- Status for networked disabled from a DNS or DHCP failure -->
		<string name="wifi_disabled_network_failure">Avoided poor Internet connection</string>
		<string name="wifi_disabled_network_failure">IP Configuration Failure</string>
		<!-- Status for networked disabled from a wifi association failure -->
		<string name="wifi_disabled_wifi_failure">WiFi Connection Failure</string>
		<!-- Status for networks disabled from authentication failure (wrong password
		or certificate). -->
		<string name="wifi_disabled_password_failure">Authentication problem</string>
		<!-- Summary for the remembered network but currently not in range. -->
		<string name="wifi_not_in_range">Not in range</string>
		<!-- Summary for the remembered network but no internet connection was detected. -->
		<string name="wifi_no_internet">No Internet Access Detected, won\'t automatically reconnect.</string>
		<!-- Substring of status line when Wi-Fi Protected Setup (WPS) is available and
		string is listed first [CHAR LIMIT=20]-->
		<string name="wifi_wps_available_first_item">WPS available</string>

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

+16 −4

Original line number	Diff line number	Diff line
		@@ -299,7 +299,6 @@ class AccessPoint extends Preference {
		// Reachable one goes before unreachable one.
		if (mRssi != Integer.MAX_VALUE && other.mRssi == Integer.MAX_VALUE) return -1;
		if (mRssi == Integer.MAX_VALUE && other.mRssi != Integer.MAX_VALUE) return 1;
		if (mRssi == Integer.MAX_VALUE && other.mRssi != Integer.MAX_VALUE) return 1;

		// Configured one goes before unconfigured one.
		if (networkId != WifiConfiguration.INVALID_NETWORK_ID
		@@ -588,6 +587,8 @@ class AccessPoint extends Preference {

		if (mState != null) { // This is the active connection
		summary.append(Summary.get(context, mState));
		} else if (mConfig != null && mConfig.noInternetAccess) {
		summary.append(context.getString(R.string.wifi_no_internet));
		} else if (mConfig != null && ((mConfig.status == WifiConfiguration.Status.DISABLED &&
		mConfig.disableReason != WifiConfiguration.DISABLED_UNKNOWN_REASON)
		\|\| mConfig.autoJoinStatus
		@@ -596,8 +597,10 @@ class AccessPoint extends Preference {
		>= WifiConfiguration.AUTO_JOIN_DISABLED_ON_AUTH_FAILURE) {
		if (mConfig.disableReason == WifiConfiguration.DISABLED_DHCP_FAILURE) {
		summary.append(context.getString(R.string.wifi_disabled_network_failure));
		} else {
		} else if (mConfig.disableReason == WifiConfiguration.DISABLED_AUTH_FAILURE) {
		summary.append(context.getString(R.string.wifi_disabled_password_failure));
		} else {
		summary.append(context.getString(R.string.wifi_disabled_wifi_failure));
		}
		} else {
		switch (mConfig.disableReason) {
		@@ -626,7 +629,7 @@ class AccessPoint extends Preference {
		//add RSSI/band information for this config, what was seen up to 6 seconds ago
		//verbose WiFi Logging is only turned on thru developers settings
		if (mInfo != null && mState != null) { // This is the active connection
		summary.append(" (f=" + Integer.toString(mInfo.getFrequency()) + ")");
		summary.append(" f=" + Integer.toString(mInfo.getFrequency()));
		}
		summary.append(" " + getVisibilityStatus());
		if (mConfig != null && mConfig.autoJoinStatus > 0) {
		@@ -644,6 +647,15 @@ class AccessPoint extends Preference {
		}
		summary.append(")");
		}
		if (mConfig != null && mConfig.numIpConfigFailures > 0) {
		summary.append(" ipf=").append(mConfig.numIpConfigFailures);
		}
		if (mConfig != null && mConfig.numConnectionFailures > 0) {
		summary.append(" cf=").append(mConfig.numConnectionFailures);
		}
		if (mConfig != null && mConfig.numAuthFailures > 0) {
		summary.append(" authf=").append(mConfig.numAuthFailures);
		}
		}

		if (summary.length() > 0) {