From d13f5cdbc96d75e4e7b09209c0d87b98df4d9ace Mon Sep 17 00:00:00 2001 From: clarencelol Date: Wed, 23 Mar 2022 16:21:09 +0800 Subject: [PATCH] sdm660-common: Update GPS blobs from LA.UM.10.2.1.r1-03400-sdm660.0 Signed-off-by: pix106 --- gps/etc/apdr.conf | 5 --- gps/etc/flp.conf | 2 +- gps/etc/gnss_antenna_info.conf | 3 +- gps/etc/gps.conf | 20 ++++----- gps/etc/izat.conf | 14 +++--- gps/etc/lowi.conf | 2 +- proprietary-files.txt | 82 ++++++++++++++++++---------------- sdm660.mk | 3 ++ 8 files changed, 66 insertions(+), 65 deletions(-) diff --git a/gps/etc/apdr.conf b/gps/etc/apdr.conf index 5a9a9225..ea2ec52f 100644 --- a/gps/etc/apdr.conf +++ b/gps/etc/apdr.conf @@ -69,11 +69,6 @@ QDR_CAN_TYPE = 14 ##Reporting offset before PPS boundary QDR_REPORTING_OFFSET = 20 # -##QDR_ENABLE_QG shall be set as 1 -QDR_ENABLE_QG = 1 -#GEAR Optimisation -QG_GEAR_ON_CHANGE=1 -# ##Vehicle Sensor Configuration (CAN data availability) ##QDR_VEH_SENSOR_CONFIG: diff --git a/gps/etc/flp.conf b/gps/etc/flp.conf index 19851b5e..65d54d38 100644 --- a/gps/etc/flp.conf +++ b/gps/etc/flp.conf @@ -12,7 +12,7 @@ # of batched locations that can be allocated, # which is limited by memory. The default # batch size defined as 20 as below. -BATCH_SIZE=40 +BATCH_SIZE=20 ################################### # FLP OUTDOOR TRIP BATCH SIZE diff --git a/gps/etc/gnss_antenna_info.conf b/gps/etc/gnss_antenna_info.conf index e037daa5..79a2aefb 100644 --- a/gps/etc/gnss_antenna_info.conf +++ b/gps/etc/gnss_antenna_info.conf @@ -80,8 +80,7 @@ # NUMBER_OF_ROWS_SGC_ and NUMBER_OF_COLUMNS_SGC_ represent the number of # rows/columns for signal gain corrections -# ANTENNA_INFO_VECTOR_SIZE must be non zero if antenna corrections are sent -# ANTENNA_INFO_VECTOR_SIZE = 2 +ANTENNA_INFO_VECTOR_SIZE = 2 CARRIER_FREQUENCY_0 = 1575.42 diff --git a/gps/etc/gps.conf b/gps/etc/gps.conf index 5f696803..bc6b40e1 100644 --- a/gps/etc/gps.conf +++ b/gps/etc/gps.conf @@ -4,9 +4,7 @@ ERR_ESTIMATE=0 #NTP server -NTP_SERVER=1.android.pool.ntp.org -NTP_SERVER_2=asia.pool.ntp.org -NTP_SERVER_3=0.cn.pool.ntp.org +NTP_SERVER=time.xtracloud.net #XTRA CA path XTRA_CA_PATH=/usr/lib/ssl-1.1/certs @@ -14,13 +12,13 @@ XTRA_CA_PATH=/usr/lib/ssl-1.1/certs # DEBUG LEVELS: 0 - none, 1 - Error, 2 - Warning, 3 - Info # 4 - Debug, 5 - Verbose # If DEBUG_LEVEL is commented, Android's logging levels will be used -DEBUG_LEVEL = 2 +DEBUG_LEVEL = 3 # Intermediate position report, 1=enable, 0=disable INTERMEDIATE_POS=0 # supl version 1.0 -SUPL_VER=0x10000 +SUPL_VER=0x20000 # Emergency SUPL, 1=enable, 0=disable #SUPL_ES=1 @@ -28,7 +26,7 @@ SUPL_VER=0x10000 #Choose PDN for Emergency SUPL #1 - Use emergency PDN #0 - Use regular SUPL PDN for Emergency SUPL -#USE_EMERGENCY_PDN_FOR_EMERGENCY_SUPL=0 +USE_EMERGENCY_PDN_FOR_EMERGENCY_SUPL=1 #SUPL_MODE is a bit mask set in config.xml per carrier by default. #If it is uncommented here, this value will overwrite the value from @@ -43,7 +41,7 @@ SUPL_VER=0x10000 # MSA = 0x04 # ON_DEMAND_TIME = 0x10 # default = ON_DEMAND_TIME | MSA | MSB | SCHEDULING -CAPABILITIES=0x17 +CAPABILITIES=0x37 # Accuracy threshold for intermediate positions # less accurate positions are ignored, 0 for passing all positions @@ -56,6 +54,8 @@ CAPABILITIES=0x17 # FOR SUPL SUPPORT, set the following # SUPL_HOST=supl.host.com or IP # SUPL_PORT=1234 +SUPL_HOST=supl.google.com +SUPL_PORT=7276 # FOR MO SUPL SUPPORT, set the following # MO_SUPL_HOST=supl.host.com or IP @@ -148,7 +148,7 @@ SGLTE_TARGET=0 # 0x1: RRC CPlane # 0x2: RRLP UPlane # 0x4: LLP Uplane -A_GLONASS_POS_PROTOCOL_SELECT = 0 +A_GLONASS_POS_PROTOCOL_SELECT = 15 ################################################## # Select technology for LPPe Control Plane @@ -157,7 +157,7 @@ A_GLONASS_POS_PROTOCOL_SELECT = 0 # 0x2: WLAN AP Measurements for LPPe CP # 0x4: SRN AP measurement for CP # 0x8: Sensor Barometer Measurement LPPe CP -#LPPE_CP_TECHNOLOGY = 0 +LPPE_CP_TECHNOLOGY = 0 ################################################## # Select technology for LPPe User Plane @@ -166,7 +166,7 @@ A_GLONASS_POS_PROTOCOL_SELECT = 0 # 0x2: WLAN AP Measurements for LPPe UP # 0x4: SRN AP measurement for UP # 0x8: Sensor Barometer Measurement LPPe UP -#LPPE_UP_TECHNOLOGY = 0 +LPPE_UP_TECHNOLOGY = 0 ################################################## # AGPS_CONFIG_INJECT diff --git a/gps/etc/izat.conf b/gps/etc/izat.conf index e236d24c..2585a8a0 100644 --- a/gps/etc/izat.conf +++ b/gps/etc/izat.conf @@ -107,7 +107,7 @@ GTP_WAA=DISABLED # PREMIUM # PREMIUM_ENV_AIDING # MODEM_DEFAULT -SAP=PREMIUM +SAP=MODEM_DEFAULT #FREE_WIFI_SCAN_INJECT valid modes: #DISABLED @@ -181,7 +181,7 @@ IZAT_FEATURE_MASK=0xf303 PLATFORMS=all SOC_IDS=all BASEBAND=all -LOW_RAM_TARGETS=DISABLED +LOW_RAM_TARGETS=ENABLED HARDWARE_TYPE=all VENDOR_ENHANCED_PROCESS=0 @@ -192,9 +192,9 @@ PROCESS_GROUPS=inet gps PREMIUM_FEATURE=1 IZAT_FEATURE_MASK=0xc03 PLATFORMS=all -SOC_IDS=all exclude 386 436 +SOC_IDS=all BASEBAND=all -LOW_RAM_TARGETS=DISABLED +LOW_RAM_TARGETS=ENABLED HARDWARE_TYPE=all VENDOR_ENHANCED_PROCESS=1 @@ -205,15 +205,15 @@ PROCESS_GROUPS=wifi inet gps system oem_2904 PREMIUM_FEATURE=1 IZAT_FEATURE_MASK=0xd03 PLATFORMS=all -SOC_IDS=all exclude 386 436 +SOC_IDS=all BASEBAND=all -LOW_RAM_TARGETS=DISABLED +LOW_RAM_TARGETS=ENABLED HARDWARE_TYPE=all VENDOR_ENHANCED_PROCESS=1 PROCESS_NAME=slim_daemon PROCESS_ARGUMENT= -PROCESS_STATE=DISABLED +PROCESS_STATE=ENABLED PROCESS_GROUPS=gps oem_2901 can plugdev diag sensors PREMIUM_FEATURE=1 IZAT_FEATURE_MASK=0xf0 diff --git a/gps/etc/lowi.conf b/gps/etc/lowi.conf index 6d4de750..83ab1bf0 100644 --- a/gps/etc/lowi.conf +++ b/gps/etc/lowi.conf @@ -22,6 +22,6 @@ # Log level # EL_LOG_OFF = 0, EL_ERROR = 1, EL_WARNING = 2, EL_INFO = 3, EL_DEBUG = 4, EL_VERBOSE = 5, EL_LOG_ALL = 100 -LOWI_LOG_LEVEL = 2 +LOWI_LOG_LEVEL = 4 LOWI_USE_LOWI_LP = 0 diff --git a/proprietary-files.txt b/proprietary-files.txt index 63fe7314..0defb221 100644 --- a/proprietary-files.txt +++ b/proprietary-files.txt @@ -330,47 +330,51 @@ system_ext/lib64/vendor.qti.hardware.fm@1.0.so|b1474a14f1a22007e2792c240777470b1 vendor/lib64/hw/vendor.qti.hardware.fm@1.0-impl.so|09569a8e251c66647cc3f91cad39bae451843076 vendor/lib64/vendor.qti.hardware.fm@1.0.so|4b327b62fe598a12665c61942e05f516580def62 -# GPS - from lemon RKQ1.201004.002 -vendor/bin/garden_app|9a27b84362075aa49c8ca67f2a6be30ad4eeb108 -vendor/bin/loc_launcher|c9a2f764201ee679c29463f405abd9625c421afc -vendor/bin/lowi-server|8126c1bf1ea2c52b90cb36d2b3f656fba27bc0c2 -vendor/bin/slim_daemon|9dfd473689b861112b62a38b6b3c8a94ac8f5160 -vendor/bin/xtra-daemon|fbc8acdf308e851ef530f743ee63bbd7affddae1 --vendor/etc/vintf/manifest/vendor.qti.gnss@4.0-service.xml|6514b13f55abc0acc28e004c35ff93fb972d61a9 +# GPS - from LA.UM.10.2.1.r1-03400-sdm660.0-kunmun +vendor/bin/garden_app|33936daa11e37a2e9d7cc8a6029c043bdf2a8bd5 +vendor/bin/loc_launcher|f170dc02d9046fcde1fc58656b0387773a85e78d +vendor/bin/lowi-server|5030a713f79f76fd70a6960e69d931b2ad8fd652 +vendor/bin/slim_daemon|210f8c890ee97bb7f1c1944b3758ce63bac03a59 +vendor/bin/xtra-daemon|f97fb76cd9b9861a4bc3934bbe9dabdd1c55fcd5 +vendor/bin/xtwifi-client|c7edbe483ce3d60a714470f30e49f1ecf5121d22 +vendor/bin/xtwifi-inet-agent|73eb9393ba634d805055eea3fbea64785063be4b vendor/etc/cacert_location.pem|0789bf799c7e45d352a83e2f79ddb0cea86db85b vendor/etc/xtra_root_cert.pem|f55a31ec4d9cf8ce2724acadecf00c779f8767db -vendor/lib64/hw/vendor.qti.gnss@4.0-impl.so|4754174dcf20c1f1d4fdc658d83237063fd9972d -vendor/lib64/libaoa.so|42a731f0b2af0d847cc75143f4c2a15db509a2a3 -vendor/lib64/libcacertclient.so|264dcc7f6fa782000978f3a6c01c8bb8000c30e8 -vendor/lib64/libcdfw.so|8d8265215a10c09390038c905fd7967081fbbffb -vendor/lib64/libcdfw_remote_api.so|dc7deb7618f05907ecfd2c3004bb3e0c39ec8522 -vendor/lib64/libdataitems.so|f13cb93394d8aae1eef85c4730b5c8f9ace092a9 -vendor/lib64/libgarden.so|aa932f38e9ed391b0ca19c7a07186780b3259786 -vendor/lib64/libgarden_haltests_e2e.so|0b9cf83029dec12e601889d893e7e05da702b918 -vendor/lib64/libgdtap.so|b0b1dfb6c8257d49d004bbd0ea14fc12794c1af2 -vendor/lib64/libgnsspps.so|7a145686f84e4a3d17a22fe9300d70f3fe8ddd77 -vendor/lib64/libizat_client_api.so|919f58e423693236448b10ee50be9d92f0937bdd -vendor/lib64/libizat_core.so|bc5c7631f721e629f89b20c27c80f4b5d3acc7b8 -vendor/lib64/liblbs_core.so|dd827bb7c4570c7b1398e83f144acf8ac6046df8 -vendor/lib64/libloc_api_v02.so|108f0590420ca26739b30c4a4f1e48036dee63ab -vendor/lib64/libloc_socket.so|99053bb105cb57f292cad5887151c26d6dd426a9 -vendor/lib64/liblocationservice.so|25b7a475a48366592a0992e83b8d7339d1c18f66 -vendor/lib64/liblocationservice_glue.so|239a4591bda5a7307fda7cf9574c7bc5cc2b0785 -vendor/lib64/liblowi_client.so|1b3d9c0b9f39bf72bd00ab0445c4bb1f089fab25 -vendor/lib64/liblowi_wifihal.so|0c87566ce9d4afecd997376fbbbdc2676d9e72a7 -vendor/lib64/libqcc_file_agent.so|87710c018b01ca71be37ea79a23bd28b8b25f665 -vendor/lib64/libslimclient.so|0a7005db6e533fa7b7bae68e6e75706fbead728d -vendor/lib64/libxtadapter.so|83744299d8cb6fb803906c121ff6b6399074651d -vendor/lib64/vendor.qti.gnss@1.0.so|c36d44d52e8f96b0810f2a4bbe88b94d52195f00 -vendor/lib64/vendor.qti.gnss@1.1.so|d443152c9a4a10c570fe2fd1fe419a42a2187ac5 -vendor/lib64/vendor.qti.gnss@1.2.so|75b910c1ff4c7f625b9d2634a43afc3a14aadf35 -vendor/lib64/vendor.qti.gnss@2.0.so|ba5cf017c9ffce8e02958404eb7f86bc17e0d13e -vendor/lib64/vendor.qti.gnss@2.1.so|edd26a738f33af4c64a16d27e09186eda325f590 -vendor/lib64/vendor.qti.gnss@3.0.so|b231e15f8951df7d41ba0d7c9fa32b49b8621a1b -vendor/lib64/vendor.qti.gnss@4.0-service.so|3c75d133af5193436167380aa89abcf05d079968 -vendor/lib64/vendor.qti.gnss@4.0.so|7a18241204a0c0977a97a6f5153cd954d9c24a65 -vendor/lib64/vendor.qti.hardware.cacert@1.0.so|2373473decd9bcc1c1e8494cc3658b91ad2dd698 -vendor/lib64/vendor.qti.hardware.qccsyshal@1.0.so|f72dfc79135a45fc2f76336ea975f63192906927 +-vendor/etc/vintf/manifest/vendor.qti.gnss@4.0-service.xml|6514b13f55abc0acc28e004c35ff93fb972d61a9 +vendor/lib64/hw/vendor.qti.gnss@4.0-impl.so|07bd0e99a143323f5c3c19cc87ab3cb9821a7010 +vendor/lib64/libaoa.so|da19c3c2b3ac8884ae190ecee991c88ebf93cb62 +vendor/lib64/libcacertclient.so|69ae73b9be13507ff39398ac5813ad709b8b7c32 +vendor/lib64/libcdfw.so|543b8282f4b6719113f04e14dd908137521e2bb5 +vendor/lib64/libcdfw_remote_api.so|558636f4fa4c17f29cb644c8c6e07766b7240005 +vendor/lib64/libdataitems.so|90379d3b3d036ed26bdad94a52a1cdf406f6b562 +vendor/lib64/libgarden.so|7f06d30007660c99cb1899bea2d219423268cd5f +vendor/lib64/libgarden_haltests_e2e.so|d933b4965005c53c3544a29719ed7e38ef94b68a +vendor/lib64/libgdtap.so|b46b7f6caaf2c2d4f43ed263bcdff3edfdc9f0f1 +vendor/lib64/libgnsspps.so|574d50f263c1156aa162baf54773c9a6a3fbcf4d +vendor/lib64/libizat_client_api.so|810bc49f9b8d2f798552b2ccb10f413757412264 +vendor/lib64/libizat_core.so|d45b75be3e4e6bcd26793cb4325b696165b68c2a +vendor/lib64/libjnihelper.so|d3687f06782adc074a38b9ff3c1aacd57ec7a6e7 +vendor/lib64/liblbs_core.so|781abc162d240dad152bbbb96c946bce4aad7b72 +vendor/lib64/libloc_api_v02.so|8cf30c68e22ea12166a473df3b9b90cf8da411d4 +vendor/lib64/libloc_socket.so|da7fb549487c50cb2b58600a7a7a7d75f2a05c24 +vendor/lib64/liblocationservice.so|95278b496b162ac8352c5ae407388f35b3b36aef +vendor/lib64/liblocationservice_glue.so|95f05d44ea815d85e8f0e024dd8e7b045813d488 +vendor/lib64/liblowi_client.so|4cd9c849a5f781e1c2c5da7a5eb88d766847b203 +vendor/lib64/liblowi_wifihal.so|41da421546ce0db553029c206bfbdabd670f9190 +vendor/lib64/libqcc_file_agent.so|3707206276c3f8a37d0ab6ee7b2360b5bffe2b3e +vendor/lib64/libqdma_file_agent.so|c199c2a1d73411558db9b1c0e1bc6f4af19d881a +vendor/lib64/libslimclient.so|bd2378a1fe7f2b02a4ddd5793bd880695588edd4 +vendor/lib64/libxtadapter.so|44bbd8cd9b6f429e22d0e36b4c96727163eaa317 +vendor/lib64/vendor.qti.gnss@1.0.so|5cc0d0c8e7a8083f5892eb303ab1e6d4c9d66639 +vendor/lib64/vendor.qti.gnss@1.1.so|9a516f4b1b55798f0ec1ebead0c653ad65546517 +vendor/lib64/vendor.qti.gnss@1.2.so|1266128a166aed91804aebc1513524eb09424f64 +vendor/lib64/vendor.qti.gnss@2.0.so|8dc78f86e141c05f5b404cb3236910896c10d941 +vendor/lib64/vendor.qti.gnss@2.1.so|81142c88b15688a671bd372f013dfb2e77d1998d +vendor/lib64/vendor.qti.gnss@3.0.so|1c0b41eddcc4789e1ea842be02d511afad123a8e +vendor/lib64/vendor.qti.gnss@4.0-service.so|04233086636be1aeaaedf88d3126803b0c40c11d +vendor/lib64/vendor.qti.gnss@4.0.so|e38ae43982dc62bf48193a6c3eb2ae385adb37aa +vendor/lib64/vendor.qti.hardware.cacert@1.0.so|1633c31212d1ea9338b79ebfc2476f83424f36ee +vendor/lib64/vendor.qti.hardware.qccsyshal@1.0.so|3ff445db2dd2db1a1068fe70a54a6c04fbdd3123 # GPU firmware - from jasmine-user-10-QKQ1.190910.002-V11.0.19.0.QDIMIXM vendor/firmware/a512_zap.b00|85a7fc0008f9a2071d8b3d0cc212b19141633267 diff --git a/sdm660.mk b/sdm660.mk index 1d45cf16..ec8f7c09 100644 --- a/sdm660.mk +++ b/sdm660.mk @@ -234,6 +234,9 @@ PRODUCT_PACKAGES += \ libbatching \ libgeofencing \ libgnss \ + libgps.utils \ + libloc_core \ + liblocation_api \ libwifi-hal-ctrl # GPS Config