Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Vinit Deshapnde
2013-09-20 19:30:26 +00:00
committed by Android (Google) Code Review
parent 5006eb75e6 0fd3b1be14
commit a5fb120438
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
wifi/java/android/net/wifi/WifiConfiguration.java
View File

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