summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunyu Lai <junyulai@google.com>2023-02-02 16:03:32 +0800
committerNatasha Lee <natashalee@google.com>2023-02-23 03:51:24 +0000
commitf848c4d77f9a69d364091d5ca330f21156de1509 (patch)
treed82bc357f36472261dba792894808d1e9dc31de0
parentdc39b32014fbf19b5bb54b7f95a125a4429ed9b6 (diff)
downloadgs101-f848c4d77f9a69d364091d5ca330f21156de1509.tar.gz
Set activelyPreferBadwifi config to 1 for different platforms
This flag will not take effect if the system is configured to avoid bad wifis. Set it to 1 globally. Then it will sprint into effect for all mcc/mncs where config_networkAvoidBadWifi is 0. For carriers that don't need this behavior change but config_networkAvoidBadWifi is 0, set activelyPreferBadwifi to 0 for their mccmncs. Test: manual Bug: 270006176 Change-Id: I4b6fe4964e8fd5d61978f1433dcbbd9e9b10ffc3 (cherry picked from commit 3357b8cf949b9e632d10759ba8bc700b72ac2242)
-rw-r--r--rro_overlays/ConnectivityOverlay/res/values-mcc204-mnc04/config.xml28
-rw-r--r--rro_overlays/ConnectivityOverlay/res/values/config.xml4
2 files changed, 32 insertions, 0 deletions
diff --git a/rro_overlays/ConnectivityOverlay/res/values-mcc204-mnc04/config.xml b/rro_overlays/ConnectivityOverlay/res/values-mcc204-mnc04/config.xml
new file mode 100644
index 00000000..2a6d2e5c
--- /dev/null
+++ b/rro_overlays/ConnectivityOverlay/res/values-mcc204-mnc04/config.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+ * Copyright (C) 2022 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+-->
+<resources>
+ <!-- Whether the device should automatically switch away from Wi-Fi networks that lose
+ Internet access. Actual device behaviour is controlled by
+ Settings.Global.NETWORK_AVOID_BAD_WIFI. This is the default value of that setting. -->
+ <integer translatable="false" name="config_networkAvoidBadWifi">0</integer>
+
+ <!-- Whether the device should actively prefer bad wifi to good cell on Android 12/13
+ for configurations where config_avoidBadWifi=0. -->
+ <integer translatable="false" name="config_activelyPreferBadWifi">0</integer>
+</resources>
diff --git a/rro_overlays/ConnectivityOverlay/res/values/config.xml b/rro_overlays/ConnectivityOverlay/res/values/config.xml
index d9a29b07..d9e9b583 100644
--- a/rro_overlays/ConnectivityOverlay/res/values/config.xml
+++ b/rro_overlays/ConnectivityOverlay/res/values/config.xml
@@ -23,4 +23,8 @@
<!-- Mask to use when checking skb mark defined in config_networkWakeupPacketMark above. -->
<integer translatable="false" name="config_networkWakeupPacketMask">0x80000000</integer>
+
+ <!-- Whether the device should actively prefer bad wifi to good cell on Android 12/13
+ for configurations where config_avoidBadWifi=0. -->
+ <integer translatable="false" name="config_activelyPreferBadWifi">1</integer>
</resources>