diff options
| author | Vinit Deshapnde <vinitd@google.com> | 2013-09-20 19:30:26 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-09-20 19:30:26 +0000 |
| commit | a5fb1204385be2ab58bb4b653fbffae4f365b98c (patch) | |
| tree | 9c4350d5031e5a173e86b2d7aa026e359f062845 /wifi | |
| parent | 5006eb75e6d42ac107734fa8134a726158d768d8 (diff) | |
| parent | 0fd3b1be14ec6b6ba33140efa321b27dc3bf2862 (diff) | |
| download | frameworks_base-a5fb1204385be2ab58bb4b653fbffae4f365b98c.zip frameworks_base-a5fb1204385be2ab58bb4b653fbffae4f365b98c.tar.gz frameworks_base-a5fb1204385be2ab58bb4b653fbffae4f365b98c.tar.bz2 | |
Merge "Fix incorrect exception being thrown from WifiConfiguration" into klp-dev
Diffstat (limited to 'wifi')
| -rw-r--r-- | wifi/java/android/net/wifi/WifiConfiguration.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/wifi/java/android/net/wifi/WifiConfiguration.java b/wifi/java/android/net/wifi/WifiConfiguration.java index 2b3c9e2..4c84f17 100644 --- 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; |