From e3a264221a7c4a658c8a4e621f3eed9e2c9abaec Mon Sep 17 00:00:00 2001 From: Bruno Martins Date: Mon, 8 Jan 2018 00:06:46 +0000 Subject: [PATCH] msm8937-common: Update GPS stack to O-MR1 * From bardock-pro - OPM1.171019.011 --- board/gps.mk | 2 +- gps/etc/apdr.conf | 44 +++++++++++++++++ gps/etc/flp.conf | 31 ++++++++++++ gps/etc/gps.conf | 72 +++++++++++++++++++--------- gps/etc/izat.conf | 93 +++++++++++++++++++++++++---------- gps/etc/lowi.conf | 30 ------------ gps/etc/sap.conf | 4 +- gps/etc/xtwifi.conf | 101 ++++++++++++++++++--------------------- product/qcom-gps.mk | 20 ++++---- proprietary-files-qc.txt | 86 ++++++++++++++++----------------- rootdir/init.qcom.rc | 2 +- 11 files changed, 295 insertions(+), 190 deletions(-) create mode 100644 gps/etc/apdr.conf diff --git a/board/gps.mk b/board/gps.mk index ef67844..1624208 100644 --- a/board/gps.mk +++ b/board/gps.mk @@ -1,3 +1,3 @@ # GPS +BOARD_VENDOR_QCOM_GPS_LOC_API_HARDWARE := true USE_DEVICE_SPECIFIC_GPS := true -TARGET_NO_RPC := true diff --git a/gps/etc/apdr.conf b/gps/etc/apdr.conf new file mode 100644 index 0000000..c75f688 --- /dev/null +++ b/gps/etc/apdr.conf @@ -0,0 +1,44 @@ +# AP DR SENSOR Configuration file +# +# SENSOR_SERVICE options are one of below +# accel,gyro,vehicle_accel,vehicle_gyro,pedometer,vehicle_odometry,accel_temp, +# gyro_temp,baro,mag_calib,mag_uncalib,amd,rmd. +# +# SENSOR_PROVIDER options is one of -- default,native,ssc,samlite. +# +# SENSOR_RATE = 1~100 (Hz) +# +# SENSOR_SAMPLES = 1~N +# +# SENSOR_STATISTIC_ENABLED +# bit 0: Diag Print Enabled +# bit 1: Adb Print Enabled +# SENSOR_STATISTIC_PRINT_COUNT +# Skip Number of Print +# + +SENSOR_SERVICE = accel +SENSOR_PROVIDER = native +SENSOR_RATE = 100 +SENSOR_SAMPLES = 1 +SENSOR_STATISTIC_ENABLED = 3 +SENSOR_STATISTIC_PRINT_COUNT = 50 + +SENSOR_SERVICE = vehicle_accel +SENSOR_PROVIDER = native +SENSOR_RATE = 10 +SENSOR_SAMPLES = 1 +SENSOR_STATISTIC_ENABLED = 3 +SENSOR_STATISTIC_PRINT_COUNT = 50 + +SENSOR_SERVICE = gyro +SENSOR_PROVIDER = native +SENSOR_RATE = 100 +SENSOR_SAMPLES = 1 +SENSOR_STATISTIC_ENABLED = 3 +SENSOR_STATISTIC_PRINT_COUNT = 50 + +GNSS_POS_STATISTIC_ENABLED = 3 +GNSS_POS_STATISTIC_PRNTCNT = 10 +GNSS_MSR_STATISTIC_ENABLED = 3 +GNSS_MSR_STATISTIC_PRNTCNT = 10 diff --git a/gps/etc/flp.conf b/gps/etc/flp.conf index a424121..dae3b82 100644 --- a/gps/etc/flp.conf +++ b/gps/etc/flp.conf @@ -14,6 +14,16 @@ # batch size defined as 20 as below. BATCH_SIZE=20 +# The number of batched locations +# requested to modem for outdoor +# trip batching. The desired number +# defined below may not be satisfied, as +# the modem can only return the number +# of batched locations that can be allocated, +# which is limited by memory. The default +# trip batch size defined as 600 as below. +OUTDOOR_TRIP_BATCH_SIZE=600 + ################################### # FLP BATCHING SESSION TIMEOUT ################################### @@ -58,3 +68,24 @@ ACCURACY=1 # 2: MEDIUM responsiveness # 3: HIGH responsiveness FLP_GEOFENCE_RESPONSIVENESS_OVERRIDE = 0 + +#################################### +# By default APPS must support LB only if modem support +# LB 1.5 and above. This parameter adds an exception +# for targets where modem only supports LB 1.0. +# This might be useful for primarily outdoor devices. +# 0: MUST NOT ALLOW LB IF MODEM ONLY SUPPORTS +# LB 1.0 +# 1: ALLOW LB IF MODEM ONLY SUPPORTS LB 1.0 +#################################### +ALLOW_LB_1_0 = 0 + +#################################### +# By default if network fixes are not sensor assisted +# these fixes must be dropped. This parameter adds an exception +# for targets where there is no PDR and we still want to +# report out network fixes +# 0: MUST NOT ALLOW NETWORK FIXES +# 1: ALLOW NETWORK FIXES +#################################### +ALLOW_NETWORK_FIXES = 0 diff --git a/gps/etc/gps.conf b/gps/etc/gps.conf index df27575..d97df86 100644 --- a/gps/etc/gps.conf +++ b/gps/etc/gps.conf @@ -1,4 +1,5 @@ -#URLs from which to download XTRA data +#Uncommenting these urls would only enable +#the power up auto injection and force injection(test case). XTRA_SERVER_1=https://xtrapath1.izatcloud.net/xtra3grc.bin XTRA_SERVER_2=https://xtrapath2.izatcloud.net/xtra3grc.bin XTRA_SERVER_3=https://xtrapath3.izatcloud.net/xtra3grc.bin @@ -8,7 +9,7 @@ XTRA_SERVER_3=https://xtrapath3.izatcloud.net/xtra3grc.bin #AUTO = 1 #XTRA2 = 2 #XTRA3 = 3 -XTRA_VERSION_CHECK=1 +XTRA_VERSION_CHECK=0 # Error Estimate # _SET = 1 @@ -24,7 +25,7 @@ XTRA_CA_PATH=/system/etc/security/cacerts # 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 = 3 +DEBUG_LEVEL = 2 # Intermediate position report, 1=enable, 0=disable INTERMEDIATE_POS=0 @@ -34,25 +35,25 @@ INTERMEDIATE_POS=0 # Set bit 0x1 if MO GPS functionalities are to be locked # Set bit 0x2 if NI GPS functionalities are to be locked # default - non is locked for backward compatibility -#GPS_LOCK = 0 +GPS_LOCK = 3 -# supl version 1.0 -SUPL_VER=0x10000 +# supl version 2.0 +SUPL_VER=0x20000 # Emergency SUPL, 1=enable, 0=disable -SUPL_ES=0 +#SUPL_ES=0 #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=0 #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 #config.xml. #MSA=0X2 #MSB=0X1 -#SUPL_MODE= +SUPL_MODE=1 # GPS Capabilities bit mask # SCHEDULING = 0x01 @@ -72,8 +73,8 @@ CAPABILITIES=0x37 ################################ # FOR SUPL SUPPORT, set the following -# SUPL_HOST=supl.host.com or IP -# SUPL_PORT=1234 +SUPL_HOST=supl.google.com +SUPL_PORT=7275 # FOR C2K PDE SUPPORT, set the following # C2K_HOST=c2k.pde.com or IP @@ -117,6 +118,8 @@ A_GLONASS_POS_PROTOCOL_SELECT = 0 ################################################## # 0x1: DBH for LPPe CP # 0x2: WLAN AP Measurements for LPPe CP +# 0x4: SRN AP measurement for CP +# 0x8: Sensor Barometer Measurement LPPe CP LPPE_CP_TECHNOLOGY = 0 ################################################## @@ -124,6 +127,8 @@ LPPE_CP_TECHNOLOGY = 0 ################################################## # 0x1: DBH for LPPe UP # 0x2: WLAN AP Measurements for LPPe UP +# 0x4: SRN AP measurement for UP +# 0x8: Sensor Barometer Measurement LPPe UP LPPE_UP_TECHNOLOGY = 0 ################################################## @@ -140,43 +145,64 @@ LPPE_UP_TECHNOLOGY = 0 # 0: disable # 1: enable AGPS_CONFIG_INJECT = 1 + +################################################## +# GNSS settings for automotive use cases +# Configurations in following section are +# specific to automotive use cases, others +# please do not change, keep the default values +################################################## + +################################################## # AP Coarse Timestamp Uncertainty ################################################## # default : 10 -# or as per clock uncertainty of product +# AP time stamp uncertainty, until GNSS receiver +# is able to acquire better timing information AP_TIMESTAMP_UNCERTAINTY = 10 -##################################### -# GNSS PPS settings -##################################### -#AP DR engine availability status -# 0 : NO AP DR (default) -# 1 : AP DR enabled +################################################## +# QDR engine availability status +################################################## +# 0 : NO QDR (default) +# 1 : QDR enabled +# This settings enables QDR Configuration for +# automotive use case, if enabled then +# DR_AP_Service needs to be enabled in izat.con #EXTERNAL_DR_ENABLED = 0 ##################################### -#DR_SYNC Pulse Availability +# DR_SYNC Pulse Availability ##################################### # 0 : DR_SYNC pulse not available (default) # 1 : DR_SYNC pulse available +# This configuration enables the driver to make use +# of PPS events generated by DR_SYNC pulse +# Standard Linux PPS driver needs to be enabled DR_SYNC_ENABLED = 0 ##################################### -#PPS Device name +# PPS Device name ##################################### PPS_DEVICENAME = /dev/pps0 ##################################### -#AP Clock Accuracy +# AP Clock Accuracy ##################################### +# Quality of APPS processor clock (in PPM). +# Value specified is used for calculation of +# APPS time stamp uncertainty AP_CLOCK_PPM = 100 ##################################### -#MAX ms difference to detect missing pulse +# MAX ms difference to detect missing pulse ##################################### +# Specifies time threshold in ms to validate any missing PPS pulses MISSING_PULSE_TIME_DELTA = 900 ##################################### -#Propagation time uncertainty +# Propagation time uncertainty ##################################### +# This settings enables time uncertainty propagation +# logic incase of missing PPS pulse PROPAGATION_TIME_UNCERTAINTY = 1 diff --git a/gps/etc/izat.conf b/gps/etc/izat.conf index 3149719..a697739 100644 --- a/gps/etc/izat.conf +++ b/gps/etc/izat.conf @@ -9,10 +9,18 @@ IZAT_DEBUG_LEVEL = 2 ################################################## WIFI_WAIT_TIMEOUT_SELECT = 0 +################################################## +# Time interval of injecting SRN scan data to modem +# time in seconds. +# Note: recommended value is between 1-5 sec +################################################## +LPPE_SRN_DATA_SCAN_INJECT_TIME=2 + ################################ # NLP Settings ################################ # NLP_MODE 1: OSNLP Only, 2: QNP Only, 3: Combo, 4: QNP preferred +# For Automotive products, please use NLP_MODE = 4 only. # NLP_TOLERANCE_TIME_FIRST: Time in ms used in Combo mode # to determine how much Tolerance for first position # NLP_TOLERANCE_TIME_AFTER: Time in ms used in Combo mode @@ -29,7 +37,7 @@ WIFI_WAIT_TIMEOUT_SELECT = 0 # without EULA consent, but the uncertainty can be high. # QNP preferred mode prefers QNP when there is EULA consent, # otherwise OSNLP is used. -NLP_MODE = 3 +NLP_MODE = 1 NLP_MODE_EMERGENCY = 2 NLP_TOLERANCE_TIME_FIRST = 5000 NLP_TOLERANCE_TIME_AFTER = 20000 @@ -66,6 +74,18 @@ ZPP_TRIGGER_THRESHOLD=60000 # 3: HIGH responsiveness GEOFENCE_SERVICES_RESPONSIVENESS_OVERRIDE = 0 +##################################### +#GTP Opt-In app +##################################### + +#GTP privacy policy version url +#https support is required +GTP_PRIVACY_VERSION_URL = https://info.izatcloud.net/privacy/version.html + +#GTP privacy policy version download retry interval +#unit is second. default is 86400 +GTP_PRIVACY_RETRY_INTERVAL = 86400 + ##################################### # IZAT PREMIUM FEATURE SETTINGS ##################################### @@ -82,12 +102,12 @@ GTP_CELL_PROC=MODEM #GTP_CELL valid modes: # DISABLED # BASIC -GTP_CELL=BASIC +GTP_CELL=DISABLED #GTP_WIFI valid modes: # DISABLED # BASIC -GTP_WIFI=BASIC +GTP_WIFI=DISABLED #GTP_WAA valid modes: # DISABLED @@ -132,6 +152,9 @@ WIFI_SUPPLICANT_INFO=BASIC # ENABLED # DISABLED +#PROCESS_NAME +# Name of the executable file. + #FEATURE MASKS: # GTP-WIFI 0X03 # GTP-AP-CELL 0X0c @@ -152,10 +175,10 @@ WIFI_SUPPLICANT_INFO=BASIC #1. Any valid values obtained from ro.baseband separated by single space. For example: sglte sglte2 #2. 'all' or 'all exclude' -> for all basebands #3. 'all exclude XXXX' -> All basebands exclude XXXX. For example: all exclude sglte -PROCESS_NAME=/system/bin/DR_AP_Service +PROCESS_NAME=DR_AP_Service PROCESS_ARGUMENT= PROCESS_STATE=DISABLED -PROCESS_GROUPS=gps net_raw diag qcom_diag +PROCESS_GROUPS=gps diag PREMIUM_FEATURE=0 IZAT_FEATURE_MASK=0 PLATFORMS=all @@ -166,10 +189,10 @@ HARDWARE_TYPE=automotive #Valyes for LEAN_TARGETS can be: #ENABLED -> if this process is supposed to run on lean and mean targets #DISABLED -> if this process is to be disabled on lean and mean targets -PROCESS_NAME=/system/bin/garden_app -PROCESS_ARGUMENT=-u 0 -q 0 -j 0 -g 0 -l 0 -Z 0 -T 1 +PROCESS_NAME=garden_app +PROCESS_ARGUMENT=-l 0 -T 1 PROCESS_STATE=ENABLED -PROCESS_GROUPS=gps +PROCESS_GROUPS=gps diag PREMIUM_FEATURE=0 IZAT_FEATURE_MASK=0 PLATFORMS=all @@ -177,7 +200,7 @@ BASEBAND=all LEAN_TARGETS=DISABLED HARDWARE_TYPE=automotive -PROCESS_NAME=/system/bin/gpsone_daemon +PROCESS_NAME=gpsone_daemon PROCESS_ARGUMENT= PROCESS_STATE=ENABLED PROCESS_GROUPS=inet @@ -188,10 +211,10 @@ BASEBAND=svlte2a sglte sglte2 LEAN_TARGETS=DISABLED HARDWARE_TYPE=all -PROCESS_NAME=/system/bin/lowi-server +PROCESS_NAME=lowi-server PROCESS_ARGUMENT= PROCESS_STATE=ENABLED -PROCESS_GROUPS=gps net_admin wifi inet qcom_diag +PROCESS_GROUPS=gps net_admin wifi inet oem_2950 PREMIUM_FEATURE=0 IZAT_FEATURE_MASK=0xf303 PLATFORMS=all @@ -199,35 +222,55 @@ BASEBAND=all LEAN_TARGETS=DISABLED HARDWARE_TYPE=all -PROCESS_NAME=/system/bin/xtwifi-inet-agent +PROCESS_NAME=xtwifi-inet-agent PROCESS_ARGUMENT= PROCESS_STATE=ENABLED PROCESS_GROUPS=inet gps PREMIUM_FEATURE=1 -IZAT_FEATURE_MASK=0xc0f -PLATFORMS=all -BASEBAND=all -LEAN_TARGETS=DISABLED -HARDWARE_TYPE=all - -PROCESS_NAME=/system/bin/xtwifi-client -PROCESS_ARGUMENT= -PROCESS_STATE=ENABLED -PROCESS_GROUPS=wifi inet gps rfs_shared system -PREMIUM_FEATURE=1 IZAT_FEATURE_MASK=0xf0f PLATFORMS=all BASEBAND=all LEAN_TARGETS=DISABLED HARDWARE_TYPE=all -PROCESS_NAME=/system/vendor/bin/slim_daemon +PROCESS_NAME=xtwifi-client PROCESS_ARGUMENT= PROCESS_STATE=ENABLED -PROCESS_GROUPS=gps qcom_diag can +PROCESS_GROUPS=wifi inet gps oem_2952 system wakelock +PREMIUM_FEATURE=1 +IZAT_FEATURE_MASK=0xf0f +PLATFORMS=all +BASEBAND=all +LEAN_TARGETS=DISABLED +HARDWARE_TYPE=all + +PROCESS_NAME=slim_daemon +PROCESS_ARGUMENT= +PROCESS_STATE=ENABLED +PROCESS_GROUPS=gps oem_2950 can PREMIUM_FEATURE=1 IZAT_FEATURE_MASK=0xf0 PLATFORMS=all BASEBAND=all LEAN_TARGETS=DISABLED HARDWARE_TYPE=all + +PROCESS_NAME=xtra-daemon +PROCESS_ARGUMENT= +PROCESS_STATE=ENABLED +PROCESS_GROUPS=inet gps system +PREMIUM_FEATURE=0 +IZAT_FEATURE_MASK=0 +PLATFORMS=all +BASEBAND=all +LEAN_TARGETS=DISABLED +HARDWARE_TYPE=all + +################################################## +# The name of process which launches XTRA client. +# Default process name in software which launches +# XTRA client is system-server. Uncomment the below +# to set the desired process which will start the +# XTRA client. +################################################## +# XC20_LAUNCH_PROCESS_NAME=garden_app diff --git a/gps/etc/lowi.conf b/gps/etc/lowi.conf index cfadcb2..0e4376b 100644 --- a/gps/etc/lowi.conf +++ b/gps/etc/lowi.conf @@ -16,36 +16,6 @@ # X86 ONLY - UBUNTU: # Copy this file in the same directory where the executable is -# The RSSI threshold used in the RTT outlier detection in half decibels. Default value recommended by the -# system team currently is -140 (corresponding to -70 dB). -LOWI_RSSI_THRESHOLD_FOR_RTT = -140 - -# Number of measurment per AP for RTS/CTS -LOWI_RTS_CTS_NUM_MEAS = 5 - -# Maximum Number of Outstanding Requests supported -LOWI_MAX_OUTSTANDING_REQUEST = 255 - -# Maximum number of records in Cache -LOWI_MAX_NUM_CACHE_RECORDS = 200 - -# Default threshold before issuing another fresh scan (ms) -LOWI_FRESH_SCAN_THRESHOLD = 500 - -# Timeout in case no result is reported by the driver (seconds) -LOWI_NO_RESULT_WAIT_TOLERANCE = 10 - -# Use Fake Wifi driver. Only valid for engineering builds -LOWI_USE_FAKE_WIFI_DRIVER = 0 - -# Use ROME Wifi driver. Only valid for engineering builds -# Will be removed later only for development support -LOWI_USE_ROME_WIFI_DRIVER = 0 - -# Use LOWI LP. -# When enabled the Discovery Request will be routed to LOWI-LP -LOWI_USE_LOWI_LP = 1 - # 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 diff --git a/gps/etc/sap.conf b/gps/etc/sap.conf index 2e377af..1269b0f 100644 --- a/gps/etc/sap.conf +++ b/gps/etc/sap.conf @@ -52,6 +52,9 @@ SENSOR_ALGORITHM_CONFIG_MASK=0x1 VN_ACCEL_CFG=1:128,0,12,0.0048828125,12,12,0.0048828125,24,12,0.0048828125 VN_GYRO_CFG=1:129,0,16,0.00006103515625,16,16,0.00006103515625,32,16,0.00006103515625 VN_ODOMETRY_CFG=1:130,0,1,5,6,32 +VN_SPEED_CFG=1:131,5,8,1,2,3,1,1,9,2,14,2 +VN_DWS_CFG=1:132,5,8,1,2,3,1,1,5,2,7,2,9,2,11,2,13,2,15,2,17,2,19,2 +VN_GEAR_CFG=1:422,20,4,0,4,1,9,0,1,2,3,4,5,6,7,8 #Procesors clock ratio: AP and CAN bus microcontroller VN_PROC_CLOCK_RATIO=1.93165618815148 @@ -64,4 +67,3 @@ VN_PROC_CLOCK_RATIO=1.93165618815148 # 3 - CLOCK_REALTIME # 4 - CLOCK_BOOTTIME using Alarm timer interface NDK_PROVIDER_TIME_SOURCE=1 - diff --git a/gps/etc/xtwifi.conf b/gps/etc/xtwifi.conf index 89f5067..583dd3f 100644 --- a/gps/etc/xtwifi.conf +++ b/gps/etc/xtwifi.conf @@ -6,6 +6,52 @@ #Copyright (c) 2012-2014 Qualcomm Atheros, Inc. #All Rights Reserved. #Qualcomm Atheros Confidential and Proprietary. +# +#Copyright (c) 2017 Qualcomm Technologies, Inc. +#All Rights Reserved. +#Confidential and Proprietary - Qualcomm Technologies, Inc. + +############################################################################## +# non-IOT devices configuration items # +# For non-IOT devices, configure below configuration items # +# according to the app note: 80-NK218-1 and remove the configuration items # +# in section of "IOT devices configuration items". # +############################################################################## + +# ASN URI v2 to be used by some GTP AP modules that +# need to run with ASN URI v2 protocol. +XT_SERVER_ROOT_URL = https://gtp1.izatcloud.net:443/uds/v2 + +# ASN URI v3 to be used by GTP AP modules that +# can support ASN URI v3 protocol. +XT_SERVER_ROOT_URL_V3 = https://gtp1.izatcloud.net:443/uds/v3 + +# size, in bytes, of the cache on device +SIZE_BYTE_TOTAL_CACHE = 5000000 + +############################################################################## +# IOT devices configuration items # +# For IOT devices, configure below configuration items # +# according to the app note and remove the configuration items in section of # +# "non-IOT devices configuration items". # +############################################################################## + +# ASN URI v3 to be used by GTP AP modules that +# can support ASN URI v3 protocol. +# XT_SERVER_ROOT_URL_V3 = https://gtpma1.izatcloud.net:443/uds/v3 + +# 1: default mode, where mobile downloads tiles and partitions +# 2: mode for memory and bandwidth limited devices, where mobile +# downloads AP list and cell list +# GTP_AP_MODE = 2 + +# 1: MP cell features relies on GTP AP for either download or upload +# 0: MP cell features does not rely on GTP AP +# GTP_AP_NEEDED_BY_MP_CELL = 1 + +############################################################################## +# Configuration items applicable to all devices # +############################################################################## # Log verbosity control for most of the GTP WiFi system, including native and # Java componenets @@ -20,63 +66,10 @@ OEM_ID_IN_REQUEST_TO_SERVER = "Qualcomm" # default "UNKNOWN" MODEL_ID_IN_REQUEST_TO_SERVER = "UNKNOWN" -############################################################################## -# GTP-WiFi positioning config # -############################################################################## - -# URL for the server position request -XT_SERVER_ROOT_URL = https://gtpa1.izatcloud.net:443/uds/v2 - -# size, in bytes, of the cache on device -SIZE_BYTE_TOTAL_CACHE = 5000000 - -# value 0: (default) use the async LOWI wifi scanner -# value 10: FAKE AP wifi scanner -WIFI_SCANNER_CHOICE = 0 - -############################################################################## -# XT-WiFi crowd sourcing config # -############################################################################## -# Use server suggestion for crowd sourcing configuration -ENABLE_SERVER_SUGGESTION_FOR_CROWD_SOURCING = 1 - -# Maximum number of APs to be collected for upload -NUM_MAX_AP_PER_UPLOAD = 16383 -# Number of minutes between upload: 24 hours -INTERVAL_MIN_UPLOAD = 1440 -# Number of minutes between forced upload: 5 days -INTERVAL_MIN_FORCED_UPLOAD = 7200 - -# The minimum time between two collected AP data sets in seconds -INTERVAL_SEC_AP_SETS_COLLECT = 10 -# Timeout for scan interval when phone is on: 600 seconds (10 minute) -INTERVAL_SEC_SCAN = 600 -# Timeout for scan interval when phone has not continusouly on for INTERVAL_MIN_SCAN -INTERVAL_MIN_FORCED_SCAN = 480 - -# Maximum number of Cell DB records for upload -WWAN_MAX_CELLDB_RECORDS_PER_UPLOAD = 1000 - -############################################################################## -# GTP AP cell config # -############################################################################## -# This item specifies the RIL server name. -# This configure item can not be removed in Android target. -XTRAT_WWAN_LITE_LOC_RIL_SERVER_NAME = "OS-Agent" - -# Maximum total number of SNA records cached in mobile storage. -# Max allowed value is 10000 -# Min value is 100 -XTRAT_WWAN_LITE_MAX_DL_SNA = 10000 - -# Maximum total number of BSA records cached in mobile storage. -# Max allowed value is 65000 -# Min value is 100 -XTRAT_WWAN_LITE_MAX_DL_BSA = 65000 - ############################################################################## # Qualcomm Network Location Provider config # ############################################################################## + # Accuracy Threshold for NLP position. Position exceeds thsi threshold will be filtered out. # Default is 25000 meters. LARGE_ACCURACY_THRESHOLD_TO_FILTER_NLP_POSITION = 25000 diff --git a/product/qcom-gps.mk b/product/qcom-gps.mk index 5f1d80a..b0c735a 100644 --- a/product/qcom-gps.mk +++ b/product/qcom-gps.mk @@ -1,20 +1,18 @@ # GPS PRODUCT_PACKAGES += \ - android.hardware.gnss@1.0-impl \ - gps.msm8937 \ + android.hardware.gnss@1.0-impl-qti \ libcurl \ + libgnss \ libgnsspps -PRODUCT_BOOT_JARS += \ - com.qti.location.sdk - PRODUCT_COPY_FILES += \ - $(VENDOR_PATH)/gps/etc/flp.conf:system/etc/flp.conf \ - $(VENDOR_PATH)/gps/etc/gps.conf:system/etc/gps.conf \ - $(VENDOR_PATH)/gps/etc/izat.conf:system/etc/izat.conf \ - $(VENDOR_PATH)/gps/etc/lowi.conf:system/etc/lowi.conf \ - $(VENDOR_PATH)/gps/etc/sap.conf:system/etc/sap.conf \ - $(VENDOR_PATH)/gps/etc/xtwifi.conf:system/etc/xtwifi.conf + $(VENDOR_PATH)/gps/etc/apdr.conf:$(TARGET_COPY_OUT_VENDOR)/etc/apdr.conf \ + $(VENDOR_PATH)/gps/etc/flp.conf:$(TARGET_COPY_OUT_VENDOR)/etc/flp.conf \ + $(VENDOR_PATH)/gps/etc/gps.conf:$(TARGET_COPY_OUT_VENDOR)/etc/gps.conf \ + $(VENDOR_PATH)/gps/etc/izat.conf:$(TARGET_COPY_OUT_VENDOR)/etc/izat.conf \ + $(VENDOR_PATH)/gps/etc/lowi.conf:$(TARGET_COPY_OUT_VENDOR)/etc/lowi.conf \ + $(VENDOR_PATH)/gps/etc/sap.conf:$(TARGET_COPY_OUT_VENDOR)/etc/sap.conf \ + $(VENDOR_PATH)/gps/etc/xtwifi.conf:$(TARGET_COPY_OUT_VENDOR)/etc/xtwifi.conf # Permissions PRODUCT_COPY_FILES += \ diff --git a/proprietary-files-qc.txt b/proprietary-files-qc.txt index a9f13a7..5196784 100644 --- a/proprietary-files-qc.txt +++ b/proprietary-files-qc.txt @@ -151,50 +151,48 @@ vendor/lib64/libtzdrmgenprov.so vendor/lib/hw/gatekeeper.msm8937.so vendor/lib64/hw/gatekeeper.msm8937.so -# GPS - from garlic (YUREKA BLACK) --framework/com.qti.location.sdk.jar --framework/com.qualcomm.location.vzw_library.jar --framework/izat.xt.srv.jar --lib64/libloc_api_v02.so --lib64/libloc_ds_api.so --priv-app/com.qualcomm.location/com.qualcomm.location.apk -bin/loc_launcher:vendor/bin/loc_launcher -bin/lowi-server:vendor/bin/lowi-server -bin/xtwifi-client:vendor/bin/xtwifi-client -bin/xtwifi-inet-agent:vendor/bin/xtwifi-inet-agent -etc/permissions/com.qti.location.sdk.xml -etc/permissions/com.qualcomm.location.vzw_library.xml -etc/permissions/com.qualcomm.location.xml -etc/permissions/izat.xt.srv.xml -etc/xtra_root_cert.pem -vendor/bin/slim_daemon -vendor/lib64/hw/flp.default.so -vendor/lib64/libalarmservice_jni.so -vendor/lib64/libasn1cper.so -vendor/lib64/libasn1crt.so -vendor/lib64/libasn1crtx.so -vendor/lib64/libdataitems.so -vendor/lib64/libDRPlugin.so -vendor/lib64/libdrplugin_client.so -vendor/lib64/libevent_observer.so -vendor/lib64/libflp.so -vendor/lib64/libgdtap.so -vendor/lib64/libgeofence.so -vendor/lib64/libizat_client_api.so -vendor/lib64/libizat_core.so -vendor/lib64/liblbs_core.so -vendor/lib64/libloc_ext.so -vendor/lib64/libloc_externalDr.so -vendor/lib64/liblocationservice.so -vendor/lib64/liblocationservice_glue.so -vendor/lib64/liblowi_client.so -vendor/lib64/liblowi_wifihal.so -vendor/lib64/liblowi_wifihal_nl.so -vendor/lib64/libslimclient.so -vendor/lib64/libulp2.so -vendor/lib64/libxt_native.so -vendor/lib64/libxtadapter.so -vendor/lib64/libxtwifi_ulp_adaptor.so +# GPS - from bardock-pro - OPM1.171019.011 +etc/permissions/com.qti.location.sdk.xml|cb68a566bd77dcc75bb7547199d528289fac01cb +etc/permissions/com.qualcomm.location.xml|e837966b6a1a63430ac7ff648e84b0312cd3a46b +etc/permissions/izat.xt.srv.xml|a0f460056f27b5495a4d6e959eecf0e429c42a57 +framework/com.qti.location.sdk.jar|f2e9f1d49201e1bad83008445fdafe9541e9b2bd +framework/izat.xt.srv.jar|e10f1baf6ae0f70c4a529e5711559cebbc3644c9 +lib64/liblocationservice_jni.so|84fddd9ace2be661d26cad1864281c386b709cb2 +lib64/libxt_native.so|900aa51d3d2f731b906a321e25c259fbab656f1c +lib64/vendor.qti.gnss@1.0.so|716a812a9f4cdb45c57eb0a6fabb17624a91d553 +-priv-app/com.qualcomm.location/com.qualcomm.location.apk|397314f080f553489440c63da44d01f482e6b761 +vendor/bin/hw/vendor.qti.gnss@1.0-service|bdf23fe2af07c2afb74721023431446104fd828d +vendor/bin/loc_launcher|0675f4524d2c9e94f7e978b5e00734c0835ddf15 +vendor/bin/lowi-server|4aa6f305f31ff36fdddc7e3beeb29cf0bf1a9d54 +vendor/bin/slim_daemon|ac7b90dcc27ef1d1fdd6a1c98bc495f90d19ecf4 +vendor/bin/xtra-daemon|8dac3ae4b8d1be18b40763861f9440b6278ff902 +vendor/etc/cacert_location.pem|0789bf799c7e45d352a83e2f79ddb0cea86db85b +vendor/etc/init/vendor.qti.gnss@1.0-service.rc|98655e2adc2158a052b0ecf06b065535f0a2aac7 +vendor/etc/xtra_root_cert.pem|f55a31ec4d9cf8ce2724acadecf00c779f8767db +vendor/lib64/hw/vendor.qti.gnss@1.0-impl.so|3a66e268286ebfad3f1e35f54b041d6b3d2ed191 +vendor/lib64/libalarmservice_jni.so|2791b868e4f145e05d3405b99e40692e87d0a3c6 +vendor/lib64/libdataitems.so|e175d6254907cde80b1352da2874d88c3607d77f +vendor/lib64/libdrplugin_client.so|bcd1266f5775888824a925c65020cac65b4124df +vendor/lib64/libDRPlugin.so|21256ab36eb1ae0a9b32eee03a6af162d1920fc8 +vendor/lib64/libevent_observer.so|c163884372303f68e1fc073cf42d30959ef771c6 +vendor/lib64/libflp.so|22f9cfcbd1c89db91b3e9cece2f670c282eacc1b +vendor/lib64/libgdtap.so|efc9752ac1f829bd28d4575370c3bf649fb9c691 +vendor/lib64/libgeofence.so|a92df9ea383d7bad2d0283c9d160d6b26f30fdbb +vendor/lib64/libizat_client_api.so|896931c51c7fa8a9f626c971361679823e635d77 +vendor/lib64/libizat_core.so|8857e6b3b0fa04900285fad5101b4157f62f33a7 +vendor/lib64/liblbs_core.so|3f55ad81c6eaa76c9a8cdc436808692e3d12fe44 +-vendor/lib64/libloc_api_v02.so|548d3280b4b340803cc7cdbd794dfcffd65012bf +vendor/lib64/libloc_ds_api.so|88bd00eef7b3e052e2725ce8883a8da0d95028f0 +vendor/lib64/libloc_externalDr.so|9165f1621d9d34034c4921c96bf45849429f32fd +vendor/lib64/liblocationservice_glue.so|9f56f0e9089f0eadc29036c2cffd5a06852f4cb0 +vendor/lib64/liblocationservice.so|13eae193a44f991daf2c54eb2311901bd32a6d8b +vendor/lib64/liblowi_client.so|b6a6e3315ff02115fba6a3c7c023ef94530cf272 +vendor/lib64/liblowi_wifihal.so|831095ee8091008db81af836cafc8a90b210d4bc +vendor/lib64/libquipc_os_api.so|12ffd3e3a2d566d68c1ee45b0879597822df7971 +vendor/lib64/libulp2.so|1a92023fbe40d5042239f3efbdcd82f3299e8b17 +vendor/lib64/libxtadapter.so|7705b2c895dfc91f459f9e69860bc312c16b4216 +vendor/lib64/libxtwifi_ulp_adaptor.so|d2e768c4d5f44a101b12ef668f8b7393a42541ce +vendor/lib64/vendor.qti.gnss@1.0_vendor.so|249c76153f8de014bf2dd2ab623ee3d87741fbc8 # Graphics - from vince 8.1.0 OPM1.171019.019 vendor/lib/egl/eglSubDriverAndroid.so diff --git a/rootdir/init.qcom.rc b/rootdir/init.qcom.rc index b4d78c2..1927a34 100644 --- a/rootdir/init.qcom.rc +++ b/rootdir/init.qcom.rc @@ -403,7 +403,7 @@ service wpa_supplicant /vendor/bin/hw/wpa_supplicant \ service loc_launcher /vendor/bin/loc_launcher #loc_launcher will start as root and set its uid to gps class late_start - group gps inet net_raw qcom_diag net_admin wifi + group gps inet diag wifi writepid /dev/cpuset/system-background/tasks service qcom-sh /system/bin/sh /init.qcom.sh