Merge "Don't crash when asked to enable an AP with a null SSID."

2014-05-09 00:49:29 +00:00
parent 786efab54d 60a28c6c4b
commit 87b4e50bbd
1 changed files with 6 additions and 0 deletions
--- a/wifi/java/android/net/wifi/WifiConfiguration.java
+++ b/wifi/java/android/net/wifi/WifiConfiguration.java
@@ -506,6 +506,12 @@ public class WifiConfiguration implements Parcelable {
     * @hide
     */
    public boolean isValid() {
+        if (SSID == null)
+            return false;
+
+        if (allowedKeyManagement == null)
+            return false;
+
        if (allowedKeyManagement.cardinality() > 1) {
            if (allowedKeyManagement.cardinality() != 2) {
                return false;