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

Bug: 244398743
Test: extensive tests with PPS enabled in b/235270127
Change-Id: Idce3155ad73537a15023864ed57758c3fb1484c7
---
 gps.xml.b3      | 2 ++
 gps_user.xml.b3 | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/gps.xml.b3 b/gps.xml.b3
index 128f98d..99e3b58 100644
--- a/gps.xml.b3
+++ b/gps.xml.b3
@@ -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/gps_user.xml.b3 b/gps_user.xml.b3
index 80e26be..f105fa1 100644
--- a/gps_user.xml.b3
+++ b/gps_user.xml.b3
@@ -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"

From c5244b60bee4262b94cc15c1e9071f02762993b8 Mon Sep 17 00:00:00 2001
From: Chase Wu <chasewu@google.com>
Date: Mon, 12 Sep 2022 20:34:33 +0800
Subject: [PATCH 2/2] vibrator: disable f0 and redc compensation

Since those feature was enabled in android T,
disabling these features as android S version.

Bug: 241353178
Test: check the value after device boot up
Test: update PtsHapticsTestCases and run it
Signed-off-by: Chase Wu <chasewu@google.com>
Change-Id: I1b363136147beff334fba0ca1e065729dcfb57e4
---
 device-bluejay.mk | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/device-bluejay.mk b/device-bluejay.mk
index acbb58f..3c41238 100644
--- a/device-bluejay.mk
+++ b/device-bluejay.mk
@@ -222,7 +222,9 @@ PRODUCT_SHIPPING_API_LEVEL := 32
 
 # Vibrator HAL
 PRODUCT_VENDOR_PROPERTIES += \
-	ro.vendor.vibrator.hal.supported_primitives=243
+	ro.vendor.vibrator.hal.supported_primitives=243 \
+	ro.vendor.vibrator.hal.f0.comp.enabled=0 \
+	ro.vendor.vibrator.hal.redc.comp.enabled=0
 
 # Device features
 PRODUCT_COPY_FILES += \