diff options
| author | Irfan Sheriff <isheriff@google.com> | 2012-04-28 10:51:34 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-04-28 10:51:34 -0700 |
| commit | 83a708e6ad1f12eb792662aeb635453dd58b0361 (patch) | |
| tree | 62d0197508e0a6b443ca018445778a3dadaf4676 /wifi/java/android | |
| parent | 47f88d6b5229a5b0565a4e12dd3178a14e369463 (diff) | |
| parent | 00a10a1494954d124e1b11bc1ba3128e47b8ffbd (diff) | |
| download | frameworks_base-83a708e6ad1f12eb792662aeb635453dd58b0361.zip frameworks_base-83a708e6ad1f12eb792662aeb635453dd58b0361.tar.gz frameworks_base-83a708e6ad1f12eb792662aeb635453dd58b0361.tar.bz2 | |
Merge "Handle null SSID cleanly" into jb-dev
Diffstat (limited to 'wifi/java/android')
| -rw-r--r-- | wifi/java/android/net/wifi/WifiInfo.java | 1 |
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); |