From 60fde324e39f7af442b334d31acfa2fe64c42285 Mon Sep 17 00:00:00 2001
From: Jenny Ho <hsiufangho@google.com>
Date: Tue, 18 May 2021 09:00:06 +0800
Subject: [PATCH 1/2] device-common: set testing_battery_profile default 2

set 2 to prevent limit battery level in unexpected testing situation

Bug: 180511460
Bug: 220679025
Signed-off-by: Jenny Ho <hsiufangho@google.com>
Change-Id: I9f0e66cf92b26c6946af162003378dcf0fd749f9
(cherry picked from commit f9ae6c981a62769813fba4623b7ea87e2b245b44)
---
 device-common.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/device-common.mk b/device-common.mk
index 33c16fc6..35f04042 100644
--- a/device-common.mk
+++ b/device-common.mk
@@ -33,7 +33,7 @@ PRODUCT_VENDOR_PROPERTIES += ro.soc.manufacturer=Google
 PRODUCT_VENDOR_PROPERTIES += ro.soc.model=GS201
 
 PRODUCT_PRODUCT_PROPERTIES += \
-    persist.vendor.testing_battery_profile=0
+    persist.vendor.testing_battery_profile=2
 
 # The default value of this variable is false and should only be set to true when
 # the device allows users to retain eSIM profiles after factory reset of user data.

From 00c06569c66a0e770bb210a7f13f18c7a86cc531 Mon Sep 17 00:00:00 2001
From: SongFerngWang <songferngwang@google.com>
Date: Wed, 2 Mar 2022 17:41:32 +0800
Subject: [PATCH 2/2] copy the overlay from gs101

Bug: 221846447
Test: build pass
Change-Id: Ia977d59492d00bb5499523ca17cde92fd932292e
(cherry picked from commit 9e3dae66288be0358a4c454ba6807ec604a61912)
---
 .../apps/Settings/res/values/bools.xml        | 20 +++++++++++++++
 .../apps/Settings/res/values/config.xml       | 25 +++++++++++++++++++
 2 files changed, 45 insertions(+)
 create mode 100755 overlay/packages/apps/Settings/res/values/bools.xml
 create mode 100755 overlay/packages/apps/Settings/res/values/config.xml

diff --git a/overlay/packages/apps/Settings/res/values/bools.xml b/overlay/packages/apps/Settings/res/values/bools.xml
new file mode 100755
index 00000000..4b5496fe
--- /dev/null
+++ b/overlay/packages/apps/Settings/res/values/bools.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright 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 to show a preference item for mobile plan -->
+    <bool name="config_show_mobile_plan">false</bool>
+</resources>
diff --git a/overlay/packages/apps/Settings/res/values/config.xml b/overlay/packages/apps/Settings/res/values/config.xml
new file mode 100755
index 00000000..7bd1f0d5
--- /dev/null
+++ b/overlay/packages/apps/Settings/res/values/config.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright 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 to aggregate for network selection list-->
+    <bool name="config_network_selection_list_aggregation_enabled">true</bool>
+
+    <!-- The switch preference's default value of connectivity helper call quality-->
+    <bool name="config_show_connectivity_helper_call_quality">true</bool>
+    <!-- The switch preference's default value of connectivity helper DeviceToDevice-->
+    <bool name="config_show_connectivity_helper_d2d">true</bool>
+</resources>