Merge "bluejay: Use build_flags for SVN" into main
diff --git a/device-bluejay.mk b/device-bluejay.mk
index 0df21e5..72f7dfe 100644
--- a/device-bluejay.mk
+++ b/device-bluejay.mk
@@ -226,11 +226,21 @@
# GPS xml
ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT)))
- PRODUCT_COPY_FILES += \
- device/google/bluejay/gps.xml.b3:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/gps.xml
+ ifneq (,$(filter 6.1, $(TARGET_LINUX_KERNEL_VERSION)))
+ PRODUCT_COPY_FILES += \
+ device/google/bluejay/gps.6.1.xml.b3:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/gps.xml
+ else
+ PRODUCT_COPY_FILES += \
+ device/google/bluejay/gps.xml.b3:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/gps.xml
+ endif
else
- PRODUCT_COPY_FILES += \
- device/google/bluejay/gps_user.xml.b3:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/gps.xml
+ ifneq (,$(filter 6.1, $(TARGET_LINUX_KERNEL_VERSION)))
+ PRODUCT_COPY_FILES += \
+ device/google/bluejay/gps_user.6.1.xml.b3:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/gps.xml
+ else
+ PRODUCT_COPY_FILES += \
+ device/google/bluejay/gps_user.xml.b3:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/gps.xml
+ endif
endif
# This device is shipped with 32 (Android S V2)
@@ -274,3 +284,7 @@
# Disable AVF Remote Attestation
PRODUCT_AVF_REMOTE_ATTESTATION_DISABLED := true
+
+# Bluetooth device id
+PRODUCT_PRODUCT_PROPERTIES += \
+ bluetooth.device_id.product_id=20488
diff --git a/gps.6.1.xml.b3 b/gps.6.1.xml.b3
new file mode 100644
index 0000000..18f5e65
--- /dev/null
+++ b/gps.6.1.xml.b3
@@ -0,0 +1,101 @@
+<?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"
+ SuplDummyCellInfo="true"
+ SuplUseFwCellInfo="false"
+ 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"
+ ReAidingOnHotStart="false"
+ ReAidingIntervalSec="3600"
+ 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"
+ MultiCarrLnaMask="L1_EXT_ON"
+ RfType="GL_RF_4776_BRCM"
+ EnableFilteringForLTEB13="true"
+
+ WarmStandbyTimeout1Seconds="10"
+ WarmStandbyTimeout2Seconds="15"
+
+ EnableGnssPropagateInStandby="true"
+
+ RfPathLossDb_Ap="4"
+ RfPathLossDb_Cp="4"
+ 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"
+ />
+
+</glgps>
+
diff --git a/gps_user.6.1.xml.b3 b/gps_user.6.1.xml.b3
new file mode 100644
index 0000000..afa301b
--- /dev/null
+++ b/gps_user.6.1.xml.b3
@@ -0,0 +1,101 @@
+<?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"
+ SuplDummyCellInfo="true"
+ SuplUseFwCellInfo="false"
+ 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"
+ ReAidingOnHotStart="false"
+ ReAidingIntervalSec="3600"
+ 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"
+ MultiCarrLnaMask="L1_EXT_ON"
+ RfType="GL_RF_4776_BRCM"
+ EnableFilteringForLTEB13="true"
+
+ WarmStandbyTimeout1Seconds="10"
+ WarmStandbyTimeout2Seconds="15"
+
+ EnableGnssPropagateInStandby="true"
+
+ RfPathLossDb_Ap="4"
+ RfPathLossDb_Cp="4"
+ 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="false"
+ PowerMode="3"
+ MinGpsWeekNumber="2216"
+ OnChipAccMask="50"
+ EnableB1C="false"
+
+ RTICacheTimeoutSec="3600"
+ />
+
+ <gll_features
+ EnableNicAutoSwitch="true"
+ />
+
+</glgps>
+
+
