From edee0d0836174c77976a4f7ad0e88e4bcb269ac0 Mon Sep 17 00:00:00 2001
From: Edwin Tung <edwintung@google.com>
Date: Tue, 13 Sep 2022 17:09:53 +0800
Subject: [PATCH 1/4] gps: enable GNSS PPS feature

Bug: 244398743
Test: extensive tests with PPS enabled in b/235270127
Change-Id: I5b452df216575fd6e570f29a7845033615e7b8a3
---
 gnss/47765/config/gps.xml             | 2 ++
 gnss/47765/config/gps.xml.oriole      | 2 ++
 gnss/47765/config/gps.xml.raven       | 2 ++
 gnss/47765/config/gps_user.xml        | 2 ++
 gnss/47765/config/gps_user.xml.oriole | 2 ++
 gnss/47765/config/gps_user.xml.raven  | 2 ++
 gnss/47765/config/lhd.conf            | 1 +
 gnss/47765/config/lhd_user.conf       | 1 +
 8 files changed, 14 insertions(+)

diff --git a/gnss/47765/config/gps.xml b/gnss/47765/config/gps.xml
index 391923b0..40dcd36f 100644
--- a/gnss/47765/config/gps.xml
+++ b/gnss/47765/config/gps.xml
@@ -59,9 +59,11 @@
        CpLppeUseAgnssLocForEmptyDbh="true"
        ReAidingOnHotStart="false"
        ReAidingIntervalSec="1200"
+       PpsDevice="/sys/class/pps/pps0/assert_elapsed"
   />
 
   <gll
+       PpsEnable="true"
        LogPriMask="LOG_INFO"
        LogFacMask="LOG_NMEA | LOG_GLLIOS | LOG_GLLAPI"
        FrqPlan="FRQ_PLAN_26MHZ_2PPM_49_152MHZ_300PPB"
diff --git a/gnss/47765/config/gps.xml.oriole b/gnss/47765/config/gps.xml.oriole
index ec9be553..2e59b783 100644
--- a/gnss/47765/config/gps.xml.oriole
+++ b/gnss/47765/config/gps.xml.oriole
@@ -59,9 +59,11 @@
        CpLppeUseAgnssLocForEmptyDbh="true"
        ReAidingOnHotStart="false"
        ReAidingIntervalSec="1200"
+       PpsDevice="/sys/class/pps/pps0/assert_elapsed"
   />
 
   <gll
+       PpsEnable="true"
        LogPriMask="LOG_INFO"
        LogFacMask="LOG_NMEA | LOG_GLLIOS | LOG_GLLAPI"
        FrqPlan="FRQ_PLAN_26MHZ_2PPM_49_152MHZ_300PPB"
diff --git a/gnss/47765/config/gps.xml.raven b/gnss/47765/config/gps.xml.raven
index baccf67a..c4a25b4a 100644
--- a/gnss/47765/config/gps.xml.raven
+++ b/gnss/47765/config/gps.xml.raven
@@ -59,9 +59,11 @@
        CpLppeUseAgnssLocForEmptyDbh="true"
        ReAidingOnHotStart="false"
        ReAidingIntervalSec="1200"
+       PpsDevice="/sys/class/pps/pps0/assert_elapsed"
   />
 
   <gll
+       PpsEnable="true"
        LogPriMask="LOG_INFO"
        LogFacMask="LOG_NMEA | LOG_GLLIOS | LOG_GLLAPI"
        FrqPlan="FRQ_PLAN_26MHZ_2PPM_49_152MHZ_300PPB"
diff --git a/gnss/47765/config/gps_user.xml b/gnss/47765/config/gps_user.xml
index 2d567bb9..16c12303 100644
--- a/gnss/47765/config/gps_user.xml
+++ b/gnss/47765/config/gps_user.xml
@@ -58,9 +58,11 @@
        CpLppeUseAgnssLocForEmptyDbh="true"
        ReAidingOnHotStart="false"
        ReAidingIntervalSec="1200"
+       PpsDevice="/sys/class/pps/pps0/assert_elapsed"
   />
 
   <gll
+       PpsEnable="true"
        LogPriMask="LOG_INFO"
        LogFacMask="LOG_NMEA | LOG_GLLIOS | LOG_GLLAPI"
        FrqPlan="FRQ_PLAN_26MHZ_2PPM_49_152MHZ_300PPB"
diff --git a/gnss/47765/config/gps_user.xml.oriole b/gnss/47765/config/gps_user.xml.oriole
index 47fcca35..47ba3d1e 100644
--- a/gnss/47765/config/gps_user.xml.oriole
+++ b/gnss/47765/config/gps_user.xml.oriole
@@ -58,9 +58,11 @@
        CpLppeUseAgnssLocForEmptyDbh="true"
        ReAidingOnHotStart="false"
        ReAidingIntervalSec="1200"
+       PpsDevice="/sys/class/pps/pps0/assert_elapsed"
   />
 
   <gll
+       PpsEnable="true"
        LogPriMask="LOG_INFO"
        LogFacMask="LOG_NMEA | LOG_GLLIOS | LOG_GLLAPI"
        FrqPlan="FRQ_PLAN_26MHZ_2PPM_49_152MHZ_300PPB"
diff --git a/gnss/47765/config/gps_user.xml.raven b/gnss/47765/config/gps_user.xml.raven
index a815f5f7..3a0cb55e 100644
--- a/gnss/47765/config/gps_user.xml.raven
+++ b/gnss/47765/config/gps_user.xml.raven
@@ -58,9 +58,11 @@
        CpLppeUseAgnssLocForEmptyDbh="true"
        ReAidingOnHotStart="false"
        ReAidingIntervalSec="1200"
+       PpsDevice="/sys/class/pps/pps0/assert_elapsed"
   />
 
   <gll
+       PpsEnable="true"
        LogPriMask="LOG_INFO"
        LogFacMask="LOG_NMEA | LOG_GLLIOS | LOG_GLLAPI"
        FrqPlan="FRQ_PLAN_26MHZ_2PPM_49_152MHZ_300PPB"
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 276b8b67407c2f0f94560233bbe6d43c0183a2e5 Mon Sep 17 00:00:00 2001
From: Yifan Hong <elsk@google.com>
Date: Wed, 14 Sep 2022 14:39:25 -0700
Subject: [PATCH 2/4] Delete HALs that are already in VINTF fragments
 (google_battery)

These HALs are already included in VINTF fragments, so
there's no need to be specified here.

Test: TH
Bug: 148808037
Change-Id: Ie7bd72e3e38a7aa0d25645f47011c8121f643676
Merged-In: Ie7bd72e3e38a7aa0d25645f47011c8121f643676
---
 manifest.xml | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/manifest.xml b/manifest.xml
index a306c704..bc4c3005 100644
--- a/manifest.xml
+++ b/manifest.xml
@@ -133,14 +133,6 @@
             <instance>default</instance>
         </interface>
     </hal>
-    <hal format="aidl">
-        <name>vendor.google.google_battery</name>
-        <version>1</version>
-        <interface>
-            <name>IGoogleBattery</name>
-            <instance>default</instance>
-        </interface>
-    </hal>
     <hal format="hidl">
        <name>vendor.google.whitechapel.audio.audioext</name>
        <transport>hwbinder</transport>

From 8085e369d50cd6944a698ad4098b140129af4d55 Mon Sep 17 00:00:00 2001
From: Adam Shih <adamshih@google.com>
Date: Thu, 8 Sep 2022 12:56:57 +0800
Subject: [PATCH 3/4] get bt permission xml to gs-common

Bug: 242661555
Test: connect to bluetooth
Change-Id: I9ddee804acbbf7f29e85ab04a8df0b9ab6f527c5
---
 device.mk | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/device.mk b/device.mk
index c7fa7a0c..142fc6b3 100644
--- a/device.mk
+++ b/device.mk
@@ -829,11 +829,6 @@ PRODUCT_PACKAGES += \
 PRODUCT_PROPERTY_OVERRIDES += \
 	ro.frp.pst=/dev/block/by-name/frp
 
-# Bluetooth
-PRODUCT_COPY_FILES += \
-	frameworks/native/data/etc/android.hardware.bluetooth.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.bluetooth.xml \
-	frameworks/native/data/etc/android.hardware.bluetooth_le.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.bluetooth_le.xml
-
 # System props to enable Bluetooth Quality Report (BQR) feature
 ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT)))
 PRODUCT_PRODUCT_PROPERTIES += \

From 7a25196bf52dd758dacb5845a229f2e102f17069 Mon Sep 17 00:00:00 2001
From: Habib Moukalled <habibm@google.com>
Date: Wed, 14 Sep 2022 12:54:55 +0000
Subject: [PATCH 4/4] Upgrade device VINTF manifest for IDebugHost

Notes:
- Update the HAL version in VINTF manifest from
AIDL 1.0 to AIDL 2.0

Bug: 245126454
Test: E2E auth enroll, atests
Change-Id: I75bde5164ecb9b7a51088ba5ea4dd6ebbfce9566
---
 device_framework_matrix_product.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/device_framework_matrix_product.xml b/device_framework_matrix_product.xml
index d82a0f86..1d9648a3 100644
--- a/device_framework_matrix_product.xml
+++ b/device_framework_matrix_product.xml
@@ -58,6 +58,7 @@
     </hal>
     <hal format="aidl" optional="true">
       <name>com.google.face.debug</name>
+      <version>2</version>
         <interface>
             <name>IDebugHost</name>
             <instance>default</instance>