From e8b35d0e0a5906321f13f04f132d87b02e4cd9a4 Mon Sep 17 00:00:00 2001
From: Gabriel Biren <gbiren@google.com>
Date: Thu, 20 Oct 2022 16:49:30 +0000
Subject: [PATCH 1/2] Update gs101 compatibility matrix and makefile to use the
 AIDL wifi_ext service.

Bug: 205044134
Test: Start wifi on a Bluejay device.
Change-Id: I39c6d7177f50fd8f640f8cf31b0d99ae11b0cf77
---
 device.mk                           | 2 +-
 device_framework_matrix_product.xml | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/device.mk b/device.mk
index 27ca987d..d2930c3d 100644
--- a/device.mk
+++ b/device.mk
@@ -533,7 +533,7 @@ endif
 
 # WiFi
 PRODUCT_PACKAGES += \
-	android.hardware.wifi@1.0-service \
+	android.hardware.wifi-service \
 	wificond \
 	libwpa_client \
 	WifiOverlay \
diff --git a/device_framework_matrix_product.xml b/device_framework_matrix_product.xml
index d170208d..14b43a18 100644
--- a/device_framework_matrix_product.xml
+++ b/device_framework_matrix_product.xml
@@ -135,9 +135,9 @@
            <instance>default</instance>
        </interface>
     </hal>
-    <hal format="hidl" optional="true">
+    <hal format="aidl" optional="true">
         <name>vendor.google.wifi_ext</name>
-        <version>1.3</version>
+        <version>1</version>
         <interface>
             <name>IWifiExt</name>
             <instance>default</instance>

From ef9d0934c6b44b623bf2051b4cfdadf4040696aa Mon Sep 17 00:00:00 2001
From: Chungkai Mei <chungkai@google.com>
Date: Thu, 8 Dec 2022 10:44:04 +0000
Subject: [PATCH 2/2] Remove UClamp Threshold setting

the file node was removed so also remove these
dummy setting

Bug: 260806701
Change-Id: I23044f7f32cf4b2b2cc93205ec5751525f05ee7f
Signed-off-by: Chungkai Mei <chungkai@google.com>
---
 conf/init.gs101.rc | 1 -
 1 file changed, 1 deletion(-)

diff --git a/conf/init.gs101.rc b/conf/init.gs101.rc
index 35ab767f..d465d441 100644
--- a/conf/init.gs101.rc
+++ b/conf/init.gs101.rc
@@ -751,7 +751,6 @@ on property:sys.boot_completed=1
     setprop vendor.powerhal.init 1
 
     # Setup final cpu.uclamp
-    write /proc/vendor_sched/uclamp_threshold 8
     write /proc/vendor_sched/ta_uclamp_min 1
     write /proc/vendor_sched/fg_uclamp_min 0
     write /proc/vendor_sched/sys_prefer_idle 0