summaryrefslogtreecommitdiffstats
path: root/wifi/java/android/net
diff options
context:
space:
mode:
authorIrfan Sheriff <isheriff@google.com>2012-04-27 21:24:17 -0700
committerIrfan Sheriff <isheriff@google.com>2012-04-27 21:24:17 -0700
commit00a10a1494954d124e1b11bc1ba3128e47b8ffbd (patch)
tree6c0b8b5bd09c5209bad0b319af5af227abb843b2 /wifi/java/android/net
parentca7086f5bdbc404b01863770b6023d069f4ab720 (diff)
downloadframeworks_base-00a10a1494954d124e1b11bc1ba3128e47b8ffbd.zip
frameworks_base-00a10a1494954d124e1b11bc1ba3128e47b8ffbd.tar.gz
frameworks_base-00a10a1494954d124e1b11bc1ba3128e47b8ffbd.tar.bz2
Handle null SSID cleanly
Bug: 6411912 Change-Id: I12f9df403c9633d928d898ae675ce36303dda1a8
Diffstat (limited to 'wifi/java/android/net')
-rw-r--r--wifi/java/android/net/wifi/WifiInfo.java1
1 files changed, 1 insertions, 0 deletions
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);