From fd3b07874350d02b435904b5439e93daae9d540c Mon Sep 17 00:00:00 2001 From: TheStrix Date: Sat, 4 Jun 2016 11:48:49 +0530 Subject: [PATCH] sm8350-common: gps: Disable xtwifi location services Squashed with: Author: Michael Bestas Date: Fri Jan 15 22:14:25 2021 +0200 sm8350-common: Remove unused gps certificates * They are used by xtwifi-inet-agent which we disabled. Change-Id: I4fbf6e02276b508a27f320e630ddad3c9aada5a8 Author: Arian Date: Thu Apr 1 01:09:38 2021 +0200 sm8350-common: Remove xtwfi-client and xtwifi-inet-agent Change-Id: I232fd3b351f0e47b86f7d5d7b2a2bd0f28712d64 Change-Id: I70f39d8d611167f65bb3912590b05f8a8d121c80 --- common.mk | 7 +- config.fs | 6 -- gps/etc/Android.bp | 20 ----- gps/etc/izat.conf | 4 +- .../gnss@2.0-xtwifi-client.policy | 45 ----------- .../gnss@2.0-xtwifi-inet-agent.policy | 33 -------- gps/etc/xtwifi.conf | 78 ------------------- proprietary-files.txt | 10 --- 8 files changed, 4 insertions(+), 199 deletions(-) delete mode 100644 gps/etc/seccomp_policy/gnss@2.0-xtwifi-client.policy delete mode 100644 gps/etc/seccomp_policy/gnss@2.0-xtwifi-inet-agent.policy delete mode 100644 gps/etc/xtwifi.conf diff --git a/common.mk b/common.mk index b7a52f4..9bbf353 100644 --- a/common.mk +++ b/common.mk @@ -221,14 +221,11 @@ PRODUCT_PACKAGES += \ gps.conf \ izat.conf \ lowi.conf \ - sap.conf \ - xtwifi.conf + sap.conf PRODUCT_PACKAGES += \ gnss@2.0-base.policy \ - gnss@2.0-xtra-daemon.policy \ - gnss@2.0-xtwifi-client.policy \ - gnss@2.0-xtwifi-inet-agent.policy + gnss@2.0-xtra-daemon.policy PRODUCT_COPY_FILES += \ frameworks/native/data/etc/android.hardware.location.gps.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.location.gps.xml diff --git a/config.fs b/config.fs index 3100dd1..ecc7a95 100644 --- a/config.fs +++ b/config.fs @@ -79,12 +79,6 @@ user: AID_GPS group: AID_GPS caps: SETUID SETGID -[vendor/bin/xtwifi-client] -mode: 0755 -user: AID_GPS -group: AID_GPS -caps: NET_BIND_SERVICE BLOCK_SUSPEND WAKE_ALARM - [vendor/bin/sensors.qti] mode: 0755 user: AID_SYSTEM diff --git a/gps/etc/Android.bp b/gps/etc/Android.bp index 1436f33..95f2e80 100644 --- a/gps/etc/Android.bp +++ b/gps/etc/Android.bp @@ -40,12 +40,6 @@ prebuilt_etc { src: "sap.conf", } -prebuilt_etc { - name: "xtwifi.conf", - vendor: true, - src: "xtwifi.conf", -} - prebuilt_etc { name: "gnss@2.0-base.policy", vendor: true, @@ -59,17 +53,3 @@ prebuilt_etc { sub_dir: "seccomp_policy", src: "seccomp_policy/gnss@2.0-xtra-daemon.policy", } - -prebuilt_etc { - name: "gnss@2.0-xtwifi-client.policy", - vendor: true, - sub_dir: "seccomp_policy", - src: "seccomp_policy/gnss@2.0-xtwifi-client.policy", -} - -prebuilt_etc { - name: "gnss@2.0-xtwifi-inet-agent.policy", - vendor: true, - sub_dir: "seccomp_policy", - src: "seccomp_policy/gnss@2.0-xtwifi-inet-agent.policy", -} diff --git a/gps/etc/izat.conf b/gps/etc/izat.conf index 932afba..1fc8461 100644 --- a/gps/etc/izat.conf +++ b/gps/etc/izat.conf @@ -187,7 +187,7 @@ VENDOR_ENHANCED_PROCESS=0 PROCESS_NAME=xtwifi-inet-agent PROCESS_ARGUMENT= -PROCESS_STATE=ENABLED +PROCESS_STATE=DISABLED PROCESS_GROUPS=inet gps PREMIUM_FEATURE=1 IZAT_FEATURE_MASK=0xc03 @@ -200,7 +200,7 @@ VENDOR_ENHANCED_PROCESS=1 PROCESS_NAME=xtwifi-client PROCESS_ARGUMENT= -PROCESS_STATE=ENABLED +PROCESS_STATE=DISABLED PROCESS_GROUPS=wifi inet gps system oem_2904 PREMIUM_FEATURE=1 IZAT_FEATURE_MASK=0xd03 diff --git a/gps/etc/seccomp_policy/gnss@2.0-xtwifi-client.policy b/gps/etc/seccomp_policy/gnss@2.0-xtwifi-client.policy deleted file mode 100644 index 17df31a..0000000 --- a/gps/etc/seccomp_policy/gnss@2.0-xtwifi-client.policy +++ /dev/null @@ -1,45 +0,0 @@ - -#******************************************************************************* -# Copyright (c) 2020 The Linux Foundation. All rights reserved. -# -# Redistribution and use in source and binary forms, with or without -# modification, are permitted provided that the following conditions are -# met: -# * Redistributions of source code must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# * Redistributions in binary form must reproduce the above -# copyright notice, this list of conditions and the following -# disclaimer in the documentation and/or other materials provided -# with the distribution. -# * Neither the name of The Linux Foundation, nor the names of its -# contributors may be used to endorse or promote products derived -# from this software without specific prior written permission. -# -# THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED -# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT -# ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS -# BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR -# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF -# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR -# BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, -# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE -# OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN -# IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -# -#****************************************************************************** - -fdatasync: 1 -getdents64: 1 -gettimeofday: 1 -#ioctl: arg1 == _IOC(_IOC_NONE || arg1 == _IOC(_IOC_READ || arg1 == VSOC_MAYBE_SEND_INTERRUPT_TO_HOST -lseek: 1 -madvise: 1 -mkdirat: 1 -pwrite64: 1 - -timerfd_create: 1 -timerfd_settime: 1 -epoll_create1: 1 -epoll_pwait: 1 -epoll_ctl: 1 diff --git a/gps/etc/seccomp_policy/gnss@2.0-xtwifi-inet-agent.policy b/gps/etc/seccomp_policy/gnss@2.0-xtwifi-inet-agent.policy deleted file mode 100644 index 00df6c7..0000000 --- a/gps/etc/seccomp_policy/gnss@2.0-xtwifi-inet-agent.policy +++ /dev/null @@ -1,33 +0,0 @@ - -#******************************************************************************* -# Copyright (c) 2020 The Linux Foundation. All rights reserved. -# -# Redistribution and use in source and binary forms, with or without -# modification, are permitted provided that the following conditions are -# met: -# * Redistributions of source code must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# * Redistributions in binary form must reproduce the above -# copyright notice, this list of conditions and the following -# disclaimer in the documentation and/or other materials provided -# with the distribution. -# * Neither the name of The Linux Foundation, nor the names of its -# contributors may be used to endorse or promote products derived -# from this software without specific prior written permission. -# -# THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED -# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT -# ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS -# BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR -# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF -# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR -# BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, -# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE -# OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN -# IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -# -#****************************************************************************** - -unlinkat: 1 -sched_getaffinity: 1 diff --git a/gps/etc/xtwifi.conf b/gps/etc/xtwifi.conf deleted file mode 100644 index 5d7df9e..0000000 --- a/gps/etc/xtwifi.conf +++ /dev/null @@ -1,78 +0,0 @@ -#GTP AP Project client core config file -# -#GENERAL DESCRIPTION -#This is used by client core -# -#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 - -# 3: Wi-Fi APDB injection via Izat SDK. GTP server is not accessed -# for any GTP requests, instead notification is sent to Izat SDK. -# WiFi crowdsourcing module is disabled. -# 4: Wi-Fi APDB injection via Izat SDK. GTP server is not accessed -# for any GTP requests, instead notification is sent to Izat SDK. -# WiFi crowdsourcing module is active, also accessed via Izat SDK. -# GTP_AP_MODE = 4 - -# 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 -# OFF = 0, ERROR = 1, WARNING = 2, INFO = 3, DEBUG = 4, VERBOSE = 5, ALL = 100 -DEBUG_GLOBAL_LOG_LEVEL = 2 - -# this is used at the server side to distinguish uploads from different maker/model -# default "Qualcomm" -OEM_ID_IN_REQUEST_TO_SERVER = "Qualcomm" - -# this is used at the server side to distinguish uploads from different maker/model -# default "UNKNOWN" -MODEL_ID_IN_REQUEST_TO_SERVER = "UNKNOWN" - -############################################################################## -# 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/proprietary-files.txt b/proprietary-files.txt index 6aa3ff2..9fab1e2 100644 --- a/proprietary-files.txt +++ b/proprietary-files.txt @@ -233,19 +233,11 @@ vendor/bin/loc_launcher vendor/bin/lowi-server vendor/bin/mlid vendor/bin/xtra-daemon -vendor/bin/xtwifi-client -vendor/bin/xtwifi-inet-agent -vendor/etc/cacert_location.pem -vendor/etc/xtra_root_cert.pem vendor/lib64/hw/vendor.qti.gnss@4.0-impl.so vendor/lib64/libaoa.so -vendor/lib64/libasn1cper.so -vendor/lib64/libasn1crt.so -vendor/lib64/libasn1crtx.so vendor/lib64/libcdfw.so vendor/lib64/libcdfw_remote_api.so vendor/lib64/libdataitems.so -vendor/lib64/libgdtap.so vendor/lib64/libizat_client_api.so vendor/lib64/libizat_core.so vendor/lib64/liblbs_core.so @@ -258,8 +250,6 @@ vendor/lib64/liblowi_wifihal.so vendor/lib64/libqcc_file_agent.so vendor/lib64/libsynergy_loc_api.so vendor/lib64/libxtadapter.so -vendor/lib64/libxtwifi_server_protocol.so -vendor/lib64/libxtwifi_server_protocol_uri_v3.so vendor/lib64/vendor.qti.gnss@1.0.so vendor/lib64/vendor.qti.gnss@1.1.so vendor/lib64/vendor.qti.gnss@1.2.so