From 6b32b0b465c0c29cd1aa76451b2a6331acfea0f9 Mon Sep 17 00:00:00 2001
From: Cheng Chang <chengcha@google.com>
Date: Tue, 25 Jun 2024 05:24:39 +0000
Subject: [PATCH 1/2] gps: Set configuration by kernel version

Bug: 258364350
Test: Verification at b/258364350.
Test: Function verification at b/258364350.
Test: Compile and verify the configuration is correct.
Change-Id: I0d108ee41c8aeb794777b9d3c0e39b8ed5610ec7
---
 device-cheetah.mk             |  24 ++++++--
 device-panther.mk             |  24 ++++++--
 location/gps.6.1.xml.c10      | 106 ++++++++++++++++++++++++++++++++++
 location/gps.6.1.xml.p10      | 106 ++++++++++++++++++++++++++++++++++
 location/gps_user.6.1.xml.c10 | 105 +++++++++++++++++++++++++++++++++
 location/gps_user.6.1.xml.p10 | 105 +++++++++++++++++++++++++++++++++
 6 files changed, 458 insertions(+), 12 deletions(-)
 create mode 100644 location/gps.6.1.xml.c10
 create mode 100644 location/gps.6.1.xml.p10
 create mode 100644 location/gps_user.6.1.xml.c10
 create mode 100644 location/gps_user.6.1.xml.p10

diff --git a/device-cheetah.mk b/device-cheetah.mk
index 49a3845..e110a54 100644
--- a/device-cheetah.mk
+++ b/device-cheetah.mk
@@ -302,15 +302,27 @@ PRODUCT_SOONG_NAMESPACES += vendor/google_devices/pantah/prebuilts
 
 # Location
 ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT)))
+    PRODUCT_COPY_FILES += \
+        device/google/pantah/location/lhd.conf.c10:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/lhd.conf \
+        device/google/pantah/location/scd.conf.c10:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/scd.conf
+    ifneq (,$(filter 6.1, $(TARGET_LINUX_KERNEL_VERSION)))
         PRODUCT_COPY_FILES += \
-                device/google/pantah/location/gps.xml.c10:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/gps.xml \
-                device/google/pantah/location/lhd.conf.c10:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/lhd.conf \
-                device/google/pantah/location/scd.conf.c10:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/scd.conf
+            device/google/pantah/location/gps.6.1.xml.c10:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/gps.xml
+    else
+        PRODUCT_COPY_FILES += \
+            device/google/pantah/location/gps.xml.c10:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/gps.xml
+    endif
 else
+    PRODUCT_COPY_FILES += \
+        device/google/pantah/location/lhd_user.conf.c10:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/lhd.conf \
+        device/google/pantah/location/scd_user.conf.c10:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/scd.conf
+    ifneq (,$(filter 6.1, $(TARGET_LINUX_KERNEL_VERSION)))
         PRODUCT_COPY_FILES += \
-                device/google/pantah/location/gps_user.xml.c10:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/gps.xml \
-                device/google/pantah/location/lhd_user.conf.c10:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/lhd.conf \
-                device/google/pantah/location/scd_user.conf.c10:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/scd.conf
+            device/google/pantah/location/gps_user.6.1.xml.c10:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/gps.xml
+    else
+        PRODUCT_COPY_FILES += \
+            device/google/pantah/location/gps_user.xml.c10:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/gps.xml
+    endif
 endif
 
 # Set support one-handed mode
diff --git a/device-panther.mk b/device-panther.mk
index 0990bbd..f64ee08 100644
--- a/device-panther.mk
+++ b/device-panther.mk
@@ -285,15 +285,27 @@ PRODUCT_SOONG_NAMESPACES += vendor/google_devices/pantah/prebuilts
 
 # Location
 ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT)))
+    PRODUCT_COPY_FILES += \
+        device/google/pantah/location/lhd.conf.p10:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/lhd.conf \
+        device/google/pantah/location/scd.conf.p10:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/scd.conf
+    ifneq (,$(filter 6.1, $(TARGET_LINUX_KERNEL_VERSION)))
         PRODUCT_COPY_FILES += \
-                device/google/pantah/location/gps.xml.p10:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/gps.xml \
-                device/google/pantah/location/lhd.conf.p10:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/lhd.conf \
-                device/google/pantah/location/scd.conf.p10:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/scd.conf
+            device/google/pantah/location/gps.6.1.xml.p10:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/gps.xml
+    else
+        PRODUCT_COPY_FILES += \
+            device/google/pantah/location/gps.xml.p10:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/gps.xml
+    endif
 else
+    PRODUCT_COPY_FILES += \
+        device/google/pantah/location/lhd_user.conf.p10:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/lhd.conf \
+        device/google/pantah/location/scd_user.conf.p10:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/scd.conf
+    ifneq (,$(filter 6.1, $(TARGET_LINUX_KERNEL_VERSION)))
         PRODUCT_COPY_FILES += \
-                device/google/pantah/location/gps_user.xml.p10:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/gps.xml \
-                device/google/pantah/location/lhd_user.conf.p10:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/lhd.conf \
-                device/google/pantah/location/scd_user.conf.p10:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/scd.conf
+            device/google/pantah/location/gps_user.6.1.xml.p10:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/gps.xml
+    else
+        PRODUCT_COPY_FILES += \
+            device/google/pantah/location/gps_user.xml.p10:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/gps.xml
+    endif
 endif
 
 # Set support one-handed mode
diff --git a/location/gps.6.1.xml.c10 b/location/gps.6.1.xml.c10
new file mode 100644
index 0000000..ddc4e95
--- /dev/null
+++ b/location/gps.6.1.xml.c10
@@ -0,0 +1,106 @@
+<?xml version="1.0" encoding="utf-8"?>
+<glgps xmlns="http://www.glpals.com/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.glpals.com/ glconfig.xsd" >
+  <hal
+       PortName="/dev/ttyBCM"
+       BaudRate="921600"
+       GpioNStdbyPath="/sys/devices/platform/10940000.spi/spi_master/spi5/spi5.0/nstandby"
+       CustGpioDelayMs="250"
+       LogEnabled="true"
+       Log="JAVA"
+       SecondaryConfigPath="/data/vendor/gps/overlay/gps_overlay.xml"
+       LogDirectory="/sdcard/gps/broadcom/storage/"
+       CtrlPipe="/data/vendor/gps/glgpsctrl"
+       NmeaOutName="/data/vendor/gps/nmea_out"
+
+       acSuplServer="supl.google.com"
+       SuplPort="7275"
+       SuplLogEnable="true"
+       SuplLogFullName="/data/vendor/gps/suplflow.txt"
+       tlsEnable="true"
+
+       SuplSslMethod="SSLv23_NO_TLSv1_2"
+       SuplEnable="true"
+       SuplUseApn="false"
+       SuplUseApnNI="true"
+       SuplUseFwCellInfo="false"
+       SuplDummyCellInfo ="true"
+       SuplTlsCertDirPath="/etc/security/cacerts"
+       SuplTlsCertPath="/vendor/etc/gnss/gps.cer"
+       SuplUT1Seconds="20"
+       SuplUT2Seconds="20"
+       SuplUT3Seconds="20"
+       TcpConnectionTimeout="20"
+       SuplLppCapable="true"
+       SuplEcidCapable="true"
+       SuplVersion="2"
+       SuplMinorVersion="0"
+       SuplOtdoaCapable="true"
+       SuplOtdoaCapable2="true"
+       SuplGlonassCapable = "true"
+       SuplGalileoCapable = "true"
+       SuplBdsCapable = "true"
+       SuplMgpsCapable = "true"
+
+       RtoEnable="true"
+       RtiEnable="true"
+       HttpSyncLto="true"
+       LtoFileName="lto2.dat"
+       LtoDir="/data/vendor/gps/"
+       LtoSyncThresholdDays="1"
+
+       GnssYearOfHardware="2020"
+       CpGuardTimeSec="1"
+       CpLppGuardTimeSec="1"
+       IgnoreInjectedSystemTime="true"
+
+       AttributionAppPkgName="com.google.android.carrierlocation"
+
+       AssertEnabled="true"
+       CpLppeCancelDbhOnAgnssProvideLoc="true"
+       CpLppeUseAgnssLocForEmptyDbh="true"
+       CpLppHighAccuracyShapeMode="1"
+       ReAidingOnHotStart="false"
+       ReAidingIntervalSec="3600"
+       RuntimeSwLteFilterEnable="true"
+       PpsDevice="/sys/devices/platform/bbd_pps/pps_assert"
+       SensorsMask="0x244"
+       MaxThreadNum="13"
+  />
+
+  <gll
+       PpsEnable="true"
+       LogPriMask="LOG_INFO"
+       LogFacMask="LOG_NMEA | LOG_GLLIOS | LOG_GLLAPI"
+       FrqPlan="FRQ_PLAN_26MHZ_2PPM_49_152MHZ_300PPB"
+       MultiCarrRFMode="GL_MULTI_CARR_RF_MODE_L1_L5"
+       MultiCarrLnaMask="L1_EXT_ON|L5_EXT_ON"
+       RfType="GL_RF_4776_BRCM"
+       ExtL5Bias="20.1"
+
+       WarmStandbyTimeout1Seconds="10"
+       WarmStandbyTimeout2Seconds="15"
+
+       EnableGnssPropagateInStandby="true"
+
+       RfPathLossDb_Ap="3.91"
+       RfPathLossDb_Cp="3.91"
+       RfPathLossDb_Ap_L5="3.76"
+       RfPathLossDb_Cp_L5="3.76"
+       OnChipGpsCarrierType="3,2,3,3,2,3,2,3,3,3,1,2,1,3,2,1,2,3,1,1,1,1,3,3,3,3,3,1,2,3,2,3"
+
+       EnableOnChipStopNotification="2"
+       PowerMode="3"
+       MinGpsWeekNumber="2216"
+       OnChipAccMask="50"
+       EnableB1C="false"
+
+       RTICacheTimeoutSec="3600"
+  />
+
+  <gll_features
+       EnableNicAutoSwitch="true"
+       EnableNavic="true"
+  />
+
+</glgps>
+
diff --git a/location/gps.6.1.xml.p10 b/location/gps.6.1.xml.p10
new file mode 100644
index 0000000..46e0406
--- /dev/null
+++ b/location/gps.6.1.xml.p10
@@ -0,0 +1,106 @@
+<?xml version="1.0" encoding="utf-8"?>
+<glgps xmlns="http://www.glpals.com/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.glpals.com/ glconfig.xsd" >
+  <hal
+       PortName="/dev/ttyBCM"
+       BaudRate="921600"
+       GpioNStdbyPath="/sys/devices/platform/10940000.spi/spi_master/spi5/spi5.0/nstandby"
+       CustGpioDelayMs="250"
+       LogEnabled="true"
+       Log="JAVA"
+       SecondaryConfigPath="/data/vendor/gps/overlay/gps_overlay.xml"
+       LogDirectory="/sdcard/gps/broadcom/storage/"
+       CtrlPipe="/data/vendor/gps/glgpsctrl"
+       NmeaOutName="/data/vendor/gps/nmea_out"
+
+       acSuplServer="supl.google.com"
+       SuplPort="7275"
+       SuplLogEnable="true"
+       SuplLogFullName="/data/vendor/gps/suplflow.txt"
+       tlsEnable="true"
+
+       SuplSslMethod="SSLv23_NO_TLSv1_2"
+       SuplEnable="true"
+       SuplUseApn="false"
+       SuplUseApnNI="true"
+       SuplUseFwCellInfo="false"
+       SuplDummyCellInfo ="true"
+       SuplTlsCertDirPath="/etc/security/cacerts"
+       SuplTlsCertPath="/vendor/etc/gnss/gps.cer"
+       SuplUT1Seconds="20"
+       SuplUT2Seconds="20"
+       SuplUT3Seconds="20"
+       TcpConnectionTimeout="20"
+       SuplLppCapable="true"
+       SuplEcidCapable="true"
+       SuplVersion="2"
+       SuplMinorVersion="0"
+       SuplOtdoaCapable="true"
+       SuplOtdoaCapable2="true"
+       SuplGlonassCapable = "true"
+       SuplGalileoCapable = "true"
+       SuplBdsCapable = "true"
+       SuplMgpsCapable = "true"
+
+       RtoEnable="true"
+       RtiEnable="true"
+       HttpSyncLto="true"
+       LtoFileName="lto2.dat"
+       LtoDir="/data/vendor/gps/"
+       LtoSyncThresholdDays="1"
+
+       GnssYearOfHardware="2020"
+       CpGuardTimeSec="1"
+       CpLppGuardTimeSec="1"
+       IgnoreInjectedSystemTime="true"
+
+       AttributionAppPkgName="com.google.android.carrierlocation"
+
+       AssertEnabled="true"
+       CpLppeCancelDbhOnAgnssProvideLoc="true"
+       CpLppeUseAgnssLocForEmptyDbh="true"
+       CpLppHighAccuracyShapeMode="1"
+       ReAidingOnHotStart="false"
+       ReAidingIntervalSec="3600"
+       RuntimeSwLteFilterEnable="true"
+       PpsDevice="/sys/devices/platform/bbd_pps/pps_assert"
+       SensorsMask="0x244"
+       MaxThreadNum="13"
+  />
+
+  <gll
+       PpsEnable="true"
+       LogPriMask="LOG_INFO"
+       LogFacMask="LOG_NMEA | LOG_GLLIOS | LOG_GLLAPI"
+       FrqPlan="FRQ_PLAN_26MHZ_2PPM_49_152MHZ_300PPB"
+       MultiCarrRFMode="GL_MULTI_CARR_RF_MODE_L1_L5"
+       MultiCarrLnaMask="L1_EXT_ON|L5_EXT_ON"
+       RfType="GL_RF_4776_BRCM"
+       ExtL5Bias="21.2"
+
+       WarmStandbyTimeout1Seconds="10"
+       WarmStandbyTimeout2Seconds="15"
+
+       EnableGnssPropagateInStandby="true"
+
+       RfPathLossDb_Ap="3.6"
+       RfPathLossDb_Cp="3.6"
+       RfPathLossDb_Ap_L5="3.6"
+       RfPathLossDb_Cp_L5="3.6"
+       OnChipGpsCarrierType="3,2,3,3,2,3,2,3,3,3,1,2,1,3,2,1,2,3,1,1,1,1,3,3,3,3,3,1,2,3,2,3"
+
+       EnableOnChipStopNotification="2"
+       PowerMode="3"
+       MinGpsWeekNumber="2216"
+       OnChipAccMask="50"
+       EnableB1C="false"
+
+       RTICacheTimeoutSec="3600"
+  />
+
+  <gll_features
+       EnableNicAutoSwitch="true"
+       EnableNavic="true"
+  />
+
+</glgps>
+
diff --git a/location/gps_user.6.1.xml.c10 b/location/gps_user.6.1.xml.c10
new file mode 100644
index 0000000..f00c918
--- /dev/null
+++ b/location/gps_user.6.1.xml.c10
@@ -0,0 +1,105 @@
+<?xml version="1.0" encoding="utf-8"?>
+<glgps xmlns="http://www.glpals.com/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.glpals.com/ glconfig.xsd" >
+  <hal
+       PortName="/dev/ttyBCM"
+       BaudRate="921600"
+       GpioNStdbyPath="/sys/devices/platform/10940000.spi/spi_master/spi5/spi5.0/nstandby"
+       CustGpioDelayMs="250"
+       LogEnabled="false"
+       Log="JAVA"
+       LogDirectory="/sdcard/gps/broadcom/storage/"
+       CtrlPipe="/data/vendor/gps/glgpsctrl"
+       NmeaOutName="/data/vendor/gps/nmea_out"
+
+       acSuplServer="supl.google.com"
+       SuplPort="7275"
+       SuplLogEnable="false"
+       SuplLogFullName="/data/vendor/gps/suplflow.txt"
+       tlsEnable="true"
+
+       SuplSslMethod="SSLv23_NO_TLSv1_2"
+       SuplEnable="true"
+       SuplUseApn="false"
+       SuplUseApnNI="true"
+       SuplUseFwCellInfo="false"
+       SuplDummyCellInfo ="true"
+       SuplTlsCertDirPath="/etc/security/cacerts"
+       SuplTlsCertPath="/vendor/etc/gnss/gps.cer"
+       SuplUT1Seconds="20"
+       SuplUT2Seconds="20"
+       SuplUT3Seconds="20"
+       TcpConnectionTimeout="20"
+       SuplLppCapable="true"
+       SuplEcidCapable="true"
+       SuplVersion="2"
+       SuplMinorVersion="0"
+       SuplOtdoaCapable="true"
+       SuplOtdoaCapable2="true"
+       SuplGlonassCapable = "true"
+       SuplGalileoCapable = "true"
+       SuplBdsCapable = "true"
+       SuplMgpsCapable = "true"
+
+       RtoEnable="true"
+       RtiEnable="true"
+       HttpSyncLto="true"
+       LtoFileName="lto2.dat"
+       LtoDir="/data/vendor/gps/"
+       LtoSyncThresholdDays="1"
+
+       GnssYearOfHardware="2020"
+       CpGuardTimeSec="1"
+       CpLppGuardTimeSec="1"
+       IgnoreInjectedSystemTime="true"
+
+       AttributionAppPkgName="com.google.android.carrierlocation"
+
+       AssertEnabled="false"
+       CpLppeCancelDbhOnAgnssProvideLoc="true"
+       CpLppeUseAgnssLocForEmptyDbh="true"
+       CpLppHighAccuracyShapeMode="1"
+       ReAidingOnHotStart="false"
+       ReAidingIntervalSec="3600"
+       RuntimeSwLteFilterEnable="true"
+       PpsDevice="/sys/devices/platform/bbd_pps/pps_assert"
+       SensorsMask="0x244"
+       MaxThreadNum="13"
+  />
+
+  <gll
+       PpsEnable="true"
+       LogPriMask="LOG_INFO"
+       LogFacMask="LOG_NMEA | LOG_GLLIOS | LOG_GLLAPI"
+       FrqPlan="FRQ_PLAN_26MHZ_2PPM_49_152MHZ_300PPB"
+       MultiCarrRFMode="GL_MULTI_CARR_RF_MODE_L1_L5"
+       MultiCarrLnaMask="L1_EXT_ON|L5_EXT_ON"
+       RfType="GL_RF_4776_BRCM"
+       ExtL5Bias="20.1"
+
+       WarmStandbyTimeout1Seconds="10"
+       WarmStandbyTimeout2Seconds="15"
+
+       EnableGnssPropagateInStandby="true"
+
+       RfPathLossDb_Ap="3.91"
+       RfPathLossDb_Cp="3.91"
+       RfPathLossDb_Ap_L5="3.76"
+       RfPathLossDb_Cp_L5="3.76"
+       OnChipGpsCarrierType="3,2,3,3,2,3,2,3,3,3,1,2,1,3,2,1,2,3,1,1,1,1,3,3,3,3,3,1,2,3,2,3"
+
+       EnableOnChipStopNotification="0"
+       PowerMode="3"
+       MinGpsWeekNumber="2216"
+       OnChipAccMask="50"
+       EnableB1C="false"
+
+       RTICacheTimeoutSec="3600"
+  />
+
+  <gll_features
+       EnableNicAutoSwitch="true"
+       EnableNavic="true"
+  />
+
+</glgps>
+
diff --git a/location/gps_user.6.1.xml.p10 b/location/gps_user.6.1.xml.p10
new file mode 100644
index 0000000..6f71d32
--- /dev/null
+++ b/location/gps_user.6.1.xml.p10
@@ -0,0 +1,105 @@
+<?xml version="1.0" encoding="utf-8"?>
+<glgps xmlns="http://www.glpals.com/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.glpals.com/ glconfig.xsd" >
+  <hal
+       PortName="/dev/ttyBCM"
+       BaudRate="921600"
+       GpioNStdbyPath="/sys/devices/platform/10940000.spi/spi_master/spi5/spi5.0/nstandby"
+       CustGpioDelayMs="250"
+       LogEnabled="false"
+       Log="JAVA"
+       LogDirectory="/sdcard/gps/broadcom/storage/"
+       CtrlPipe="/data/vendor/gps/glgpsctrl"
+       NmeaOutName="/data/vendor/gps/nmea_out"
+
+       acSuplServer="supl.google.com"
+       SuplPort="7275"
+       SuplLogEnable="false"
+       SuplLogFullName="/data/vendor/gps/suplflow.txt"
+       tlsEnable="true"
+
+       SuplSslMethod="SSLv23_NO_TLSv1_2"
+       SuplEnable="true"
+       SuplUseApn="false"
+       SuplUseApnNI="true"
+       SuplUseFwCellInfo="false"
+       SuplDummyCellInfo ="true"
+       SuplTlsCertDirPath="/etc/security/cacerts"
+       SuplTlsCertPath="/vendor/etc/gnss/gps.cer"
+       SuplUT1Seconds="20"
+       SuplUT2Seconds="20"
+       SuplUT3Seconds="20"
+       TcpConnectionTimeout="20"
+       SuplLppCapable="true"
+       SuplEcidCapable="true"
+       SuplVersion="2"
+       SuplMinorVersion="0"
+       SuplOtdoaCapable="true"
+       SuplOtdoaCapable2="true"
+       SuplGlonassCapable = "true"
+       SuplGalileoCapable = "true"
+       SuplBdsCapable = "true"
+       SuplMgpsCapable = "true"
+
+       RtoEnable="true"
+       RtiEnable="true"
+       HttpSyncLto="true"
+       LtoFileName="lto2.dat"
+       LtoDir="/data/vendor/gps/"
+       LtoSyncThresholdDays="1"
+
+       GnssYearOfHardware="2020"
+       CpGuardTimeSec="1"
+       CpLppGuardTimeSec="1"
+       IgnoreInjectedSystemTime="true"
+
+       AttributionAppPkgName="com.google.android.carrierlocation"
+
+       AssertEnabled="false"
+       CpLppeCancelDbhOnAgnssProvideLoc="true"
+       CpLppeUseAgnssLocForEmptyDbh="true"
+       CpLppHighAccuracyShapeMode="1"
+       ReAidingOnHotStart="false"
+       ReAidingIntervalSec="3600"
+       RuntimeSwLteFilterEnable="true"
+       PpsDevice="/sys/devices/platform/bbd_pps/pps_assert"
+       SensorsMask="0x244"
+       MaxThreadNum="13"
+  />
+
+  <gll
+       PpsEnable="true"
+       LogPriMask="LOG_INFO"
+       LogFacMask="LOG_NMEA | LOG_GLLIOS | LOG_GLLAPI"
+       FrqPlan="FRQ_PLAN_26MHZ_2PPM_49_152MHZ_300PPB"
+       MultiCarrRFMode="GL_MULTI_CARR_RF_MODE_L1_L5"
+       MultiCarrLnaMask="L1_EXT_ON|L5_EXT_ON"
+       RfType="GL_RF_4776_BRCM"
+       ExtL5Bias="21.2"
+
+       WarmStandbyTimeout1Seconds="10"
+       WarmStandbyTimeout2Seconds="15"
+
+       EnableGnssPropagateInStandby="true"
+
+       RfPathLossDb_Ap="3.6"
+       RfPathLossDb_Cp="3.6"
+       RfPathLossDb_Ap_L5="3.6"
+       RfPathLossDb_Cp_L5="3.6"
+       OnChipGpsCarrierType="3,2,3,3,2,3,2,3,3,3,1,2,1,3,2,1,2,3,1,1,1,1,3,3,3,3,3,1,2,3,2,3"
+
+       EnableOnChipStopNotification="0"
+       PowerMode="3"
+       MinGpsWeekNumber="2216"
+       OnChipAccMask="50"
+       EnableB1C="false"
+
+       RTICacheTimeoutSec="3600"
+  />
+
+  <gll_features
+       EnableNicAutoSwitch="true"
+       EnableNavic="true"
+  />
+
+</glgps>
+

From 8f48729607f5550d5e6c6ce68b0681726f20e85a Mon Sep 17 00:00:00 2001
From: Rick Yiu <rickyiu@google.com>
Date: Tue, 2 Jul 2024 08:44:48 +0000
Subject: [PATCH 2/2] Remove NewlyIdleBalancer

NewlyIdleBalancer is not supported in kernel 6.1, so remvoe it.
Besides, the newly idle balance is mainly for ADPF now, the power
impact should be much less than before.

Bug: 350212757
Test: build pass
Change-Id: I1491954b96baa96821da09975fcdc52c8db85cab
---
 powerhint-cheetah.json | 32 --------------------------------
 powerhint-panther.json | 32 --------------------------------
 2 files changed, 64 deletions(-)

diff --git a/powerhint-cheetah.json b/powerhint-cheetah.json
index 8dac037..982c19c 100644
--- a/powerhint-cheetah.json
+++ b/powerhint-cheetah.json
@@ -356,14 +356,6 @@
       ],
       "ResetOnInit": true
     },
-    {
-      "Name": "NewlyIdleBalancer",
-      "Path": "/proc/vendor_sched/idle_balancer",
-      "Values": [
-        "0",
-        "1"
-      ]
-    },
     {
       "Name": "DisplayWakeup",
       "Path": "/sys/devices/platform/1c240000.drmdecon/early_wakeup",
@@ -1419,12 +1411,6 @@
       "Duration": 0,
       "Value": "0"
     },
-    {
-      "PowerHint": "CAMERA_STREAMING_EXTREME",
-      "Node": "NewlyIdleBalancer",
-      "Duration": 0,
-      "Value": "0"
-    },
     {
       "PowerHint": "CAMERA_STREAMING_HIGH",
       "Node": "PowerHALCameraRunning",
@@ -1551,12 +1537,6 @@
       "Duration": 0,
       "Value": "0"
     },
-    {
-      "PowerHint": "CAMERA_STREAMING_HIGH",
-      "Node": "NewlyIdleBalancer",
-      "Duration": 0,
-      "Value": "0"
-    },
     {
       "PowerHint": "CAMERA_STREAMING_STANDARD",
       "Node": "PowerHALCameraRunning",
@@ -1665,12 +1645,6 @@
       "Duration": 0,
       "Value": "0"
     },
-    {
-      "PowerHint": "CAMERA_STREAMING_STANDARD",
-      "Node": "NewlyIdleBalancer",
-      "Duration": 0,
-      "Value": "0"
-    },
     {
       "PowerHint": "CAMERA_STREAMING_LOW",
       "Node": "PowerHALCameraRunning",
@@ -1749,12 +1723,6 @@
       "Duration": 0,
       "Value": "0"
     },
-    {
-      "PowerHint": "CAMERA_STREAMING_LOW",
-      "Node": "NewlyIdleBalancer",
-      "Duration": 0,
-      "Value": "0"
-    },
     {
       "PowerHint": "CAMERA_VIDEO_RECORDING",
       "Type": "MaskHint",
diff --git a/powerhint-panther.json b/powerhint-panther.json
index e87a278..2ab2d93 100644
--- a/powerhint-panther.json
+++ b/powerhint-panther.json
@@ -336,14 +336,6 @@
       ],
       "ResetOnInit": true
     },
-    {
-      "Name": "NewlyIdleBalancer",
-      "Path": "/proc/vendor_sched/idle_balancer",
-      "Values": [
-        "0",
-        "1"
-      ]
-    },
     {
       "Name": "DisplayWakeup",
       "Path": "/sys/devices/platform/1c240000.drmdecon/early_wakeup",
@@ -1275,12 +1267,6 @@
       "Duration": 0,
       "Value": "0"
     },
-    {
-      "PowerHint": "CAMERA_STREAMING_EXTREME",
-      "Node": "NewlyIdleBalancer",
-      "Duration": 0,
-      "Value": "0"
-    },
     {
       "PowerHint": "CAMERA_STREAMING_HIGH",
       "Node": "PowerHALCameraRunning",
@@ -1407,12 +1393,6 @@
       "Duration": 0,
       "Value": "0"
     },
-    {
-      "PowerHint": "CAMERA_STREAMING_HIGH",
-      "Node": "NewlyIdleBalancer",
-      "Duration": 0,
-      "Value": "0"
-    },
     {
       "PowerHint": "CAMERA_STREAMING_STANDARD",
       "Node": "PowerHALCameraRunning",
@@ -1521,12 +1501,6 @@
       "Duration": 0,
       "Value": "0"
     },
-    {
-      "PowerHint": "CAMERA_STREAMING_STANDARD",
-      "Node": "NewlyIdleBalancer",
-      "Duration": 0,
-      "Value": "0"
-    },
     {
       "PowerHint": "CAMERA_STREAMING_LOW",
       "Node": "PowerHALCameraRunning",
@@ -1605,12 +1579,6 @@
       "Duration": 0,
       "Value": "0"
     },
-    {
-      "PowerHint": "CAMERA_STREAMING_LOW",
-      "Node": "NewlyIdleBalancer",
-      "Duration": 0,
-      "Value": "0"
-    },
     {
       "PowerHint": "CAMERA_VIDEO_RECORDING",
       "Type": "MaskHint",