diff options
| author | Roshan Pius <rpius@google.com> | 2020-05-28 23:51:36 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-05-28 23:51:36 +0000 |
| commit | 7cdd88a0bdcdc48e902b32d4c3a6b24df9c41f36 (patch) | |
| tree | c7a89acdf184f94759bd54a3e13e792f8d5d02d7 /service | |
| parent | fca2414376c11f3341571f84db2aff6f23c8b761 (diff) | |
| parent | 9909b46a7bfae1af435b4d5caffe652cb3586020 (diff) | |
Merge "WifiBackupRestore: Parse auth_alg from supplicant backup data" into rvc-dev am: f8ee42f7b6 am: 9909b46a7b
Change-Id: Ie3add86f537ecfbe1fc5bb5076337158b9aef1a2
Diffstat (limited to 'service')
| -rw-r--r-- | service/java/com/android/server/wifi/WifiBackupRestore.java | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/service/java/com/android/server/wifi/WifiBackupRestore.java b/service/java/com/android/server/wifi/WifiBackupRestore.java index c55236ee4..ab46bb62f 100644 --- a/service/java/com/android/server/wifi/WifiBackupRestore.java +++ b/service/java/com/android/server/wifi/WifiBackupRestore.java @@ -466,6 +466,8 @@ public class WifiBackupRestore { public static final String SUPPLICANT_KEY_SSID = WifiConfiguration.ssidVarName; public static final String SUPPLICANT_KEY_HIDDEN = WifiConfiguration.hiddenSSIDVarName; public static final String SUPPLICANT_KEY_KEY_MGMT = WifiConfiguration.KeyMgmt.varName; + public static final String SUPPLICANT_KEY_AUTH_ALG = + WifiConfiguration.AuthAlgorithm.varName; public static final String SUPPLICANT_KEY_CLIENT_CERT = WifiEnterpriseConfig.CLIENT_CERT_KEY; public static final String SUPPLICANT_KEY_CA_CERT = WifiEnterpriseConfig.CA_CERT_KEY; @@ -535,6 +537,7 @@ public class WifiBackupRestore { private String mParsedSSIDLine; private String mParsedHiddenLine; private String mParsedKeyMgmtLine; + private String mParsedAuthAlgLine; private String mParsedPskLine; private String[] mParsedWepKeyLines = new String[4]; private String mParsedWepTxKeyIdxLine; @@ -581,6 +584,8 @@ public class WifiBackupRestore { if (line.contains("EAP")) { isEap = true; } + } else if (line.startsWith(SUPPLICANT_KEY_AUTH_ALG + "=")) { + mParsedAuthAlgLine = line; } else if (line.startsWith(SUPPLICANT_KEY_CLIENT_CERT + "=")) { certUsed = true; } else if (line.startsWith(SUPPLICANT_KEY_CA_CERT + "=")) { @@ -660,6 +665,16 @@ public class WifiBackupRestore { } } } + if (mParsedAuthAlgLine != null) { + if (mParsedAuthAlgLine.contains("OPEN")) { + configuration.allowedAuthAlgorithms.set( + WifiConfiguration.AuthAlgorithm.OPEN); + } + if (mParsedAuthAlgLine.contains("SHARED")) { + configuration.allowedAuthAlgorithms.set( + WifiConfiguration.AuthAlgorithm.SHARED); + } + } if (mParsedPskLine != null) { configuration.preSharedKey = mParsedPskLine.substring(mParsedPskLine.indexOf('=') + 1); |