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

* commit '3a017f2c32eada0af896f8acb30353da05eef8e6': Fix display of "null" string shown in Wifi Settings for AP.
2015-05-28 18:27:31 +00:00
parent 8720e86ef4 3a017f2c32
commit 828192251c
1 changed files with 1 additions and 1 deletions
--- a/packages/SettingsLib/src/com/android/settingslib/wifi/AccessPoint.java
+++ b/packages/SettingsLib/src/com/android/settingslib/wifi/AccessPoint.java
@@ -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);
    }