From a5c2741387d0b4eb2cae9056afa8567ff373f6a2 Mon Sep 17 00:00:00 2001
From: Shuibing Dai <shuibing@google.com>
Date: Tue, 2 May 2023 13:40:32 -0700
Subject: [PATCH 1/2] Remove overlay item: country code update during setup
 wizard

The country code updating from scan results generic case can cover setup wizard case.

Bug: 279625751
Test: manually verified generic case
Change-Id: Ibb1c62e86850cf6105ff190a57bfd2e8f16d3eca
---
 rro_overlays/WifiOverlay/res/values/config.xml | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/rro_overlays/WifiOverlay/res/values/config.xml b/rro_overlays/WifiOverlay/res/values/config.xml
index bb57116d..7a58d7d4 100644
--- a/rro_overlays/WifiOverlay/res/values/config.xml
+++ b/rro_overlays/WifiOverlay/res/values/config.xml
@@ -150,11 +150,6 @@
         is when the system is in the suspended mode -->
     <bool translatable="false" name="config_wifiDtimMultiplierConfigEnabled">true</bool>
 
-    <!-- Boolean indicating whether the framework updates country from scan results when there is
-         no telephony country code and driver country code is 00.
-         This is applied only during the setup wizard -->
-    <bool translatable="false" name ="config_wifiUpdateCountryCodeFromScanResultSetupWizard">true</bool>
-
     <!-- Enable the feature of adjusting link layer stats polling interval based on
     device mobility state and client mode RSSI monitoring. -->
     <bool translatable="false" name="config_wifiAdjustPollRssiIntervalEnabled">true</bool>

From 7c4daf87e531d39dbf5c5454e8a55390d9c09abe Mon Sep 17 00:00:00 2001
From: Rick Yiu <rickyiu@google.com>
Date: Thu, 4 May 2023 02:20:26 +0000
Subject: [PATCH 2/2] Set boost_adpf_prio with property

Set boost_adpf_prio with property for experiment.

Bug: 245675204
Test: work as expected
Change-Id: I44001ef27238e6b089b7f33ebc72de6a4bd4d81e
---
 conf/init.gs101.rc | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/conf/init.gs101.rc b/conf/init.gs101.rc
index 3645b849..37c27260 100644
--- a/conf/init.gs101.rc
+++ b/conf/init.gs101.rc
@@ -361,6 +361,9 @@ on init
     write /sys/class/devfreq/gs_memlat_devfreq:devfreq_mif_cpu6_memlat@17000010/mem_latency/ratio_ceil 3200
     write /sys/class/devfreq/gs_memlat_devfreq:devfreq_mif_cpu7_memlat@17000010/mem_latency/ratio_ceil 3200
 
+    # Set boost_adpf_prio, -1 by default
+    write /proc/vendor_sched/boost_adpf_prio ${persist.device_config.vendor_system_native_boot.boost_adpf_prio:--1}
+
 on init && property:ro.boot.hw.soc.rev=0
     setprop vendor.powerhal.config powerhint_a0.json