diff options
Diffstat (limited to 'core/java/android')
| -rw-r--r-- | core/java/android/net/WifiKey.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/core/java/android/net/WifiKey.java b/core/java/android/net/WifiKey.java index 99de99ece1e5..68b505d49da6 100644 --- a/core/java/android/net/WifiKey.java +++ b/core/java/android/net/WifiKey.java @@ -64,10 +64,10 @@ public class WifiKey implements Parcelable { * @throws IllegalArgumentException if either the SSID or BSSID is invalid. */ public WifiKey(String ssid, String bssid) { - if (!SSID_PATTERN.matcher(ssid).matches()) { + if (ssid == null || !SSID_PATTERN.matcher(ssid).matches()) { throw new IllegalArgumentException("Invalid ssid: " + ssid); } - if (!BSSID_PATTERN.matcher(bssid).matches()) { + if (bssid == null || !BSSID_PATTERN.matcher(bssid).matches()) { throw new IllegalArgumentException("Invalid bssid: " + bssid); } this.ssid = ssid; |