From 3d95ab2e05a664f42950b56eee62f8890ac2ea4f Mon Sep 17 00:00:00 2001
From: Neo Yu <neoyu@google.com>
Date: Fri, 25 Nov 2022 05:00:27 +0000
Subject: [PATCH 1/2] Enable GAudio feature for AOSP build

Bug: 246550953
Test: MO/MT call
Change-Id: Ie41837923362a2cd99b635f483c6ea5a17572f09
---
 device.mk | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/device.mk b/device.mk
index d9051e0a..27ca987d 100644
--- a/device.mk
+++ b/device.mk
@@ -169,13 +169,10 @@ USES_LASSEN_MODEM := true
 ifeq ($(USES_GOOGLE_DIALER_CARRIER_SETTINGS),true)
 USE_GOOGLE_DIALER := true
 USE_GOOGLE_CARRIER_SETTINGS := true
-USES_GAUDIO := true
 endif
 
-ifeq (,$(filter aosp_%,$(TARGET_PRODUCT)))
 # Audio client implementation for RIL
 USES_GAUDIO := true
-endif
 
 # ######################
 # GRAPHICS - GPU (begin)

From aa62245e7b8b4a2a7e2c1809eecf8ab471940dcd Mon Sep 17 00:00:00 2001
From: Gabriel Biren <gbiren@google.com>
Date: Thu, 1 Dec 2022 22:27:55 +0000
Subject: [PATCH 2/2] Revert "Update gs101 compatibility matrix to use the"

This reverts commit f155498d8ad66b11c6f43e8cc6fb87ea887872d6.

Reason for revert: Blocking Wembley team

Change-Id: Ib87dc0d1afd24b2b3707bcd9bd4b06d559442372
---
 device_framework_matrix_product.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/device_framework_matrix_product.xml b/device_framework_matrix_product.xml
index 14b43a18..d170208d 100644
--- a/device_framework_matrix_product.xml
+++ b/device_framework_matrix_product.xml
@@ -135,9 +135,9 @@
            <instance>default</instance>
        </interface>
     </hal>
-    <hal format="aidl" optional="true">
+    <hal format="hidl" optional="true">
         <name>vendor.google.wifi_ext</name>
-        <version>1</version>
+        <version>1.3</version>
         <interface>
             <name>IWifiExt</name>
             <instance>default</instance>