Merge "Fix incorrect exception being thrown from WifiConfiguration" into klp-dev

2013-09-20 19:30:26 +00:00
parent 5006eb75e6 0fd3b1be14
commit a5fb120438
1 changed files with 2 additions and 2 deletions
--- a/wifi/java/android/net/wifi/WifiConfiguration.java
+++ b/wifi/java/android/net/wifi/WifiConfiguration.java
@@ -554,8 +554,8 @@ public class WifiConfiguration implements Parcelable {

    /** @hide */
    public int getAuthType() {
-        if (allowedKeyManagement.cardinality() > 1) {
-            throw new IllegalStateException("More than one auth type set");
+        if (isValid() == false) {
+            throw new IllegalStateException("Invalid configuration");
        }
        if (allowedKeyManagement.get(KeyMgmt.WPA_PSK)) {
            return KeyMgmt.WPA_PSK;