summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOscar Shu <xshu@google.com>2021-06-03 23:17:42 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2021-06-03 23:17:42 +0000
commit9d83676cd5fa47579152cd2bd5669633b5b2f485 (patch)
tree4dfa6308f89c54c330fa2eff452d36ff563d063e
parent7eb74e66215a6a540c7bdacfb5aec30497caa3ab (diff)
parent647f1d669377a810637a7de5ee29f1cf6d5b5a40 (diff)
downloadcrosshatch-9d83676cd5fa47579152cd2bd5669633b5b2f485.tar.gz
Merge "Revert "Enable MBB in device overlay"" into sc-dev am: 647f1d6693
Original change: https://googleplex-android-review.googlesource.com/c/device/google/crosshatch/+/14805540 Change-Id: Ib16dc8e32e666a9cf69117f276b71342c448a311
-rw-r--r--rro_overlays/WifiOverlay/res/values/config.xml7
1 files changed, 0 insertions, 7 deletions
diff --git a/rro_overlays/WifiOverlay/res/values/config.xml b/rro_overlays/WifiOverlay/res/values/config.xml
index 8f1aa877..04085ad1 100644
--- a/rro_overlays/WifiOverlay/res/values/config.xml
+++ b/rro_overlays/WifiOverlay/res/values/config.xml
@@ -88,11 +88,4 @@
<!-- Disable WPA2 to WPA3 auto-upgrade -->
<bool translatable="false" name="config_wifiSaeUpgradeEnabled">false</bool>
-
- <!-- STOPSHIP(b/173044646): Enable STA + STA use-cases for teamfooding/testing.
- HAL also needs to support STA + STA iface combination for the feature to be enabled.
- So STA + STA will not get enabled on all devices because of this overlay alone.
- Remove before Android 12 release! -->
- <bool translatable="false" name="config_wifiMultiStaLocalOnlyConcurrencyEnabled">true</bool>
- <bool translatable="false" name="config_wifiMultiStaNetworkSwitchingMakeBeforeBreakEnabled">true</bool>
</resources>