From 00a10a1494954d124e1b11bc1ba3128e47b8ffbd Mon Sep 17 00:00:00 2001
From: Irfan Sheriff <isheriff@google.com>
Date: Fri, 27 Apr 2012 21:24:17 -0700
Subject: Handle null SSID cleanly

Bug: 6411912
Change-Id: I12f9df403c9633d928d898ae675ce36303dda1a8
---
 wifi/java/android/net/wifi/WifiInfo.java | 1 +
 1 file changed, 1 insertion(+)

(limited to 'wifi/java/android/net')

diff --git a/wifi/java/android/net/wifi/WifiInfo.java b/wifi/java/android/net/wifi/WifiInfo.java
index 30e4a20..1f1cfdd 100644
--- a/wifi/java/android/net/wifi/WifiInfo.java
+++ b/wifi/java/android/net/wifi/WifiInfo.java
@@ -266,6 +266,7 @@ public class WifiInfo implements Parcelable {
 
     /** {@hide} */
     public static String removeDoubleQuotes(String string) {
+        if (string == null) return null;
         final int length = string.length();
         if ((length > 1) && (string.charAt(0) == '"') && (string.charAt(length - 1) == '"')) {
             return string.substring(1, length - 1);
-- 
cgit v1.1