Merge "Prevent errors when updating operator pref summary" into r-keystone-qcom-dev
diff --git a/res/values/arrays.xml b/res/values/arrays.xml
index 40cc153..f54c5f1 100644
--- a/res/values/arrays.xml
+++ b/res/values/arrays.xml
@@ -307,19 +307,6 @@
<item>@string/wifi_ap_choose_vendor_dual_band</item>
</string-array>
- <!-- Wi-Fi AP Vendor band settings for OWE Transition mode. Either 2.4GHz or 5GHz -->
- <!-- Note: OWE transition mode SAP doesn't support dual band -->
- <!-- Note: Adding/removing/moving the items will need wifi settings code change. -->
- <string-array translatable="false" name="wifi_ap_band_vendor_config_no_dual">
- <item>1</item>
- <item>2</item>
- </string-array>
-
- <string-array translatable="false" name="wifi_ap_band_vendor_summary_no_dual">
- <item>@string/wifi_ap_choose_2G</item>
- <item>@string/wifi_ap_choose_5G</item>
- </string-array>
-
<!-- Wi-Fi WPS setup for p2p connections. -->
<!-- Note that adding/removing/moving the items will need wifi settings code change. -->
<string-array name="wifi_p2p_wps_setup">
diff --git a/src/com/android/settings/wifi/tether/WifiTetherApBandPreferenceController.java b/src/com/android/settings/wifi/tether/WifiTetherApBandPreferenceController.java
index 3a13525..9b1fd76 100644
--- a/src/com/android/settings/wifi/tether/WifiTetherApBandPreferenceController.java
+++ b/src/com/android/settings/wifi/tether/WifiTetherApBandPreferenceController.java
@@ -153,9 +153,6 @@
// change the list option if AP+AP is supproted and selected security type is not OWE
entriesRes = R.array.wifi_ap_band_vendor_config_full;
summariesRes = R.array.wifi_ap_band_vendor_summary_full;
- } else if (mSecurityType == SoftApConfiguration.SECURITY_TYPE_OWE) {
- entriesRes = R.array.wifi_ap_band_vendor_config_no_dual;
- summariesRes = R.array.wifi_ap_band_vendor_summary_no_dual;
}
mBandEntries = res.getStringArray(entriesRes);
mBandSummaries = res.getStringArray(summariesRes);