Commit 694c4bf2 authored May 28, 2015 by Sanket Padawe Committed by Android Git Automerger May 28, 2015

am 041028df: am 07b815ea: am 3a017f2c: Merge "Fix display of "null" string...

am 041028df: am 07b815ea: am 3a017f2c: Merge "Fix display of "null" string shown in Wifi Settings for AP." into mnc-dev

* commit '041028df':
  Fix display of "null" string shown in Wifi Settings for AP.

parents 78329b47 041028df

packages/SettingsLib/src/com/android/settingslib/wifi/AccessPoint.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -755,7 +755,7 @@ public class AccessPoint implements Comparable<AccessPoint> {
		int index = state.ordinal();

		if (index >= formats.length \|\| formats[index].length() == 0) {
		return null;
		return "";
		}
		return String.format(formats[index], ssid);
		}