From 3e9e5fa66e222efb10125a08dc9e6ae359d9c1cc Mon Sep 17 00:00:00 2001
From: Sanket Padawe <sanketpadawe@google.com>
Date: Thu, 28 May 2015 10:41:14 -0700
Subject: [PATCH] Fix display of "null" string shown in Wifi Settings for AP.

Bug: 21476825
Change-Id: I643dcaa3112ff896e7b0abd998f2ad5e13187706
---
 .../src/com/android/settingslib/wifi/AccessPoint.java           | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/SettingsLib/src/com/android/settingslib/wifi/AccessPoint.java b/packages/SettingsLib/src/com/android/settingslib/wifi/AccessPoint.java
index 7049d6ab6668e..3130875724f65 100644
--- 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);
     }