From 5620ef23c6fb3917f931d065a1ad8f5b7f40215b Mon Sep 17 00:00:00 2001
From: Wayne Lin <waynewhlin@google.com>
Date: Thu, 28 Apr 2022 17:25:56 +0800
Subject: [PATCH 1/2] gps: enable GNSS PPS feature

Bug: 230433240
Test: verify gnss pps time pass
Change-Id: I8d2abd38f68562c8e513919be73a096a46b1625b
---
 gnss/47765/config/lhd.conf      | 1 +
 gnss/47765/config/lhd_user.conf | 1 +
 2 files changed, 2 insertions(+)

diff --git a/gnss/47765/config/lhd.conf b/gnss/47765/config/lhd.conf
index efde25ba..c000d582 100644
--- a/gnss/47765/config/lhd.conf
+++ b/gnss/47765/config/lhd.conf
@@ -31,3 +31,4 @@ SecondaryConfigPath=/data/vendor/gps/overlay/lhd_overlay.conf
 
 SkipSensorWakeLock=true
 LoggerWakeLockEnable=false
+PpsEnable=true
diff --git a/gnss/47765/config/lhd_user.conf b/gnss/47765/config/lhd_user.conf
index 0216ace9..682d03a3 100644
--- a/gnss/47765/config/lhd_user.conf
+++ b/gnss/47765/config/lhd_user.conf
@@ -29,3 +29,4 @@ TrafficLogEnabled=false
 
 SkipSensorWakeLock=true
 LoggerWakeLockEnable=false
+PpsEnable=true

From 5c47ca9e2edff675c62f8c273ee4539798dabe29 Mon Sep 17 00:00:00 2001
From: Alex Hong <rurumihong@google.com>
Date: Tue, 3 May 2022 16:08:51 +0800
Subject: [PATCH 2/2] Remove the obsoleted HAL requirements in GS201 Product
 FCM

The following HALs are upgraded now.
1. android.hardware.biometrics.face
2. android.hardware.biometrics.fingerprint
3. android.hardware.dumpstate
4. android.hardware.gnss
5. android.hardware.radio.config

Previously we claimed the requirements for old HALs in product FCM.
Now clean up these requirements since we no longer need them.

Test: m check-vintf-all
      run vts -m vts_treble_vintf_vendor_test
Bug: 207076973

Change-Id: I635f1a9c22801762f5b240425c0e3567e4c206cb
---
 device_framework_matrix_product.xml | 22 ----------------------
 1 file changed, 22 deletions(-)

diff --git a/device_framework_matrix_product.xml b/device_framework_matrix_product.xml
index 40280d7d..226ffd57 100644
--- a/device_framework_matrix_product.xml
+++ b/device_framework_matrix_product.xml
@@ -1,11 +1,4 @@
 <compatibility-matrix version="1.0" type="framework" level="7">
-    <hal format="aidl" optional="true">
-        <name>android.hardware.biometrics.face</name>
-        <interface>
-            <name>IFace</name>
-            <instance>default</instance>
-        </interface>
-    </hal>
     <hal format="aidl">
         <name>android.hardware.contexthub</name>
         <version>1</version>
@@ -14,13 +7,6 @@
             <instance>default</instance>
         </interface>
     </hal>
-    <hal format="aidl">
-        <name>android.hardware.gnss</name>
-        <interface>
-            <name>IGnss</name>
-            <instance>default</instance>
-        </interface>
-    </hal>
     <hal format="aidl">
         <name>android.hardware.graphics.composer3</name>
         <version>1</version>
@@ -37,14 +23,6 @@
             <instance>slot2</instance>
         </interface>
     </hal>
-    <hal format="hidl" optional="true">
-        <name>android.hardware.radio.config</name>
-        <version>1.1</version>
-        <interface>
-            <name>IRadioConfig</name>
-            <instance>default</instance>
-        </interface>
-    </hal>
     <hal format="aidl" optional="true">
         <name>android.hardware.vibrator</name>
         <version>2</version>