commit 2308b8be7e916aceb2e003e7ab62c538ecf73102
author Srilakshmi Kanagalla <kanagall@codeaurora.org> Wed Jun 24 12:28:53 2020 +0530
committer srilakshmi kanagalla <kanagall@codeaurora.org> Wed Jul 01 07:14:29 2020 +0000
tree 64e94850011c693033bcc318ac636352fb0789ff
parent b405e4dadd29669d46cfea21459fa4dda3d1a0c6

Decouple the configurations for OWE and SAE.

This helps to control the SAE and OWE configurations separately

Change-Id: I3238781324ef211861963673899c7be89cdeeb06
CRs-Fixed: 2722874

src/com/android/settings/wifi/tether/WifiTetherSecurityPreferenceController.java

diff --git a/src/com/android/settings/wifi/tether/WifiTetherSecurityPreferenceController.java b/src/com/android/settings/wifi/tether/WifiTetherSecurityPreferenceController.java
index 0e2c2e4..c21554c 100644
--- a/src/com/android/settings/wifi/tether/WifiTetherSecurityPreferenceController.java
+++ b/src/com/android/settings/wifi/tether/WifiTetherSecurityPreferenceController.java
@@ -18,6 +18,7 @@
     private int mSecurityValue;
     private boolean mWpa3SoftApSupported;
     private boolean mDualSoftApSupported;
+    private boolean mWpa3SoftApOweAkmSupported;
 
     public WifiTetherSecurityPreferenceController(Context context,
             OnTetherConfigUpdateListener listener) {
@@ -29,6 +30,8 @@
             com.android.internal.R.bool.config_wifi_dual_sap_mode_enabled);
         mWpa3SoftApSupported = context.getResources().getBoolean(
             com.android.internal.R.bool.config_wifi_wap3_sap_mode_enabled);
+        mWpa3SoftApOweAkmSupported = context.getResources().getBoolean(
+            com.android.internal.R.bool.config_wifi_wap3_sap_owe_akm_enabled);
 
         // Add SAE security type
         if (mWpa3SoftApSupported) {
@@ -39,7 +42,7 @@
         securityValues.add(String.valueOf(WifiConfiguration.KeyMgmt.WPA2_PSK));
         securityEntries.add(context.getString(R.string.wifi_security_wpa2));
         // Add OWE security type
-        if (mWpa3SoftApSupported && mDualSoftApSupported) {
+        if (mWpa3SoftApOweAkmSupported && mDualSoftApSupported) {
             securityValues.add(String.valueOf(WifiConfiguration.KeyMgmt.OWE));
             securityEntries.add(context.getString(R.string.wifi_security_owe));
         }
@@ -63,7 +66,7 @@
             mSecurityValue = WifiConfiguration.KeyMgmt.WPA2_PSK;
         } else if (config.getAuthType() == WifiConfiguration.KeyMgmt.NONE) {
             mSecurityValue = WifiConfiguration.KeyMgmt.NONE;
-        } else if (mWpa3SoftApSupported && mDualSoftApSupported
+        } else if (mWpa3SoftApOweAkmSupported && mDualSoftApSupported
                        && config.getAuthType() == WifiConfiguration.KeyMgmt.OWE) {
             mSecurityValue = WifiConfiguration.KeyMgmt.OWE;
         } else if (mWpa3SoftApSupported && config.getAuthType() == WifiConfiguration.KeyMgmt.SAE) {
@@ -98,7 +101,7 @@
         return mSecurityEntries[securityEntryIndex];
     }
 
-    public boolean isWpa3Supported() {
-        return mWpa3SoftApSupported;
+    public boolean isWpa3OweSupported() {
+        return mWpa3SoftApOweAkmSupported;
     }
 }

src/com/android/settings/wifi/tether/WifiTetherSettings.java

diff --git a/src/com/android/settings/wifi/tether/WifiTetherSettings.java b/src/com/android/settings/wifi/tether/WifiTetherSettings.java
index c1cd04e..760bf46 100644
--- a/src/com/android/settings/wifi/tether/WifiTetherSettings.java
+++ b/src/com/android/settings/wifi/tether/WifiTetherSettings.java
@@ -195,7 +195,7 @@
         mPasswordPreferenceController.updateVisibility(config.getAuthType());
 
         if (mApBandPreferenceController.isVendorDualApSupported()
-                && mSecurityPreferenceController.isWpa3Supported()) {
+                && mSecurityPreferenceController.isWpa3OweSupported()) {
             if ((config.getAuthType() == WifiConfiguration.KeyMgmt.OWE)
                     == (mApBandPreferenceController.isBandEntriesHasDualband())) {
                 mApBandPreferenceController.updatePreferenceEntries(config);