From 8fa9e177f3b282981e366498985ed9bde8e50e01 Mon Sep 17 00:00:00 2001 From: dianlujitao Date: Sun, 2 Feb 2020 23:40:28 +0800 Subject: sdm660-common: Update config from LA.UM.8.2.r1-05100-sdm660.0 Change-Id: I127d746d6f6534bf864dcb6d8fc703ee6ff2b3cf --- config.fs | 76 ++++++++++++++++++++++++------------- configs/privapp-permissions-qti.xml | 13 +++---- configs/public.libraries.txt | 3 ++ configs/qti_whitelist.xml | 71 +++++++++++++++++++++++++++++++++- configs/sec_config | 1 + configs/whitelistedapps.xml | 63 ------------------------------ sdm660.mk | 3 +- 7 files changed, 129 insertions(+), 101 deletions(-) delete mode 100644 configs/whitelistedapps.xml diff --git a/config.fs b/config.fs index 406609d..23cf979 100644 --- a/config.fs +++ b/config.fs @@ -1,6 +1,3 @@ -[AID_VENDOR_QCOM_DIAG] -value:2950 - [AID_VENDOR_QTI_DIAG] value:2901 @@ -8,10 +5,10 @@ value:2901 value:2902 [AID_VENDOR_RFS] -value:2951 +value:2903 [AID_VENDOR_RFS_SHARED] -value:2952 +value:2904 [AID_VENDOR_ADPL_ODL] value:2905 @@ -19,6 +16,21 @@ value:2905 [AID_VENDOR_QRTR] value:2906 +[AID_VENDOR_THERMAL] +value:2907 + +[vendor/bin/wcnss_filter] +mode: 0755 +user: AID_BLUETOOTH +group: AID_BLUETOOTH +caps: BLOCK_SUSPEND + +[system/vendor/bin/wcnss_filter] +mode: 0755 +user: AID_BLUETOOTH +group: AID_BLUETOOTH +caps: BLOCK_SUSPEND + [vendor/bin/hw/android.hardware.bluetooth@1.0-service-qti] mode: 0755 user: AID_BLUETOOTH @@ -31,6 +43,18 @@ user: AID_SYSTEM group: AID_SYSTEM caps: BLOCK_SUSPEND NET_ADMIN +[vendor/bin/hw/android.hardware.bluetooth@1.0-service-qti-lazy] +mode: 0755 +user: AID_BLUETOOTH +group: AID_BLUETOOTH +caps: BLOCK_SUSPEND NET_ADMIN + +[system/vendor/bin/hw/android.hardware.bluetooth@1.0-service-qti-lazy] +mode: 0755 +user: AID_SYSTEM +group: AID_SYSTEM +caps: BLOCK_SUSPEND NET_ADMIN + [system/bin/cnss-daemon] mode: 0755 user: AID_BLUETOOTH @@ -75,37 +99,37 @@ caps: NET_BIND_SERVICE [vendor/bin/imsdatadaemon] mode: 0755 -user: AID_SYSTEM -group: AID_SYSTEM +user: AID_RADIO +group: AID_RADIO caps: NET_BIND_SERVICE [system/vendor/bin/imsdatadaemon] mode: 0755 -user: AID_SYSTEM -group: AID_SYSTEM +user: AID_RADIO +group: AID_RADIO caps: NET_BIND_SERVICE [vendor/bin/ims_rtp_daemon] mode: 0755 -user: AID_SYSTEM +user: AID_RADIO group: AID_RADIO caps: NET_BIND_SERVICE [system/vendor/bin/ims_rtp_daemon] mode: 0755 -user: AID_SYSTEM +user: AID_RADIO group: AID_RADIO caps: NET_BIND_SERVICE [vendor/bin/imsrcsd] mode: 0755 -user: AID_SYSTEM +user: AID_RADIO group: AID_RADIO caps: NET_BIND_SERVICE BLOCK_SUSPEND WAKE_ALARM [system/vendor/bin/imsrcsd] mode: 0755 -user: AID_SYSTEM +user: AID_RADIO group: AID_RADIO caps: NET_BIND_SERVICE BLOCK_SUSPEND WAKE_ALARM @@ -121,18 +145,6 @@ user: AID_SYSTEM group: AID_SYSTEM caps: NET_BIND_SERVICE BLOCK_SUSPEND NET_ADMIN -[vendor/bin/sensors.qti] -mode: 0755 -user: AID_SYSTEM -group: AID_SYSTEM -caps: NET_BIND_SERVICE - -[system/vendor/bin/sensors.qti] -mode: 0755 -user: AID_SYSTEM -group: AID_SYSTEM -caps: NET_BIND_SERVICE - [vendor/bin/slim_daemon] mode: 0755 user: AID_GPS @@ -151,12 +163,24 @@ user: AID_GPS group: AID_GPS caps: SETUID SETGID +[system/vendor/bin/loc_launcher] +mode: 0755 +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 +group: AID_SYSTEM +caps: NET_BIND_SERVICE + [firmware/] mode: 0771 user: AID_SYSTEM @@ -171,7 +195,7 @@ caps: 0 [vendor/firmware_mnt/image/*] mode: 0771 -user: AID_ROOT +user: AID_SYSTEM group: AID_SYSTEM caps: 0 diff --git a/configs/privapp-permissions-qti.xml b/configs/privapp-permissions-qti.xml index d100bc1..380b7bd 100644 --- a/configs/privapp-permissions-qti.xml +++ b/configs/privapp-permissions-qti.xml @@ -40,9 +40,6 @@ It allows additional grants on top of privapp-permissions-platform.xml - - - @@ -88,11 +85,7 @@ It allows additional grants on top of privapp-permissions-platform.xml - - - - - + @@ -100,6 +93,10 @@ It allows additional grants on top of privapp-permissions-platform.xml + + + + diff --git a/configs/public.libraries.txt b/configs/public.libraries.txt index 19c3863..94c0a5d 100644 --- a/configs/public.libraries.txt +++ b/configs/public.libraries.txt @@ -1,3 +1,6 @@ libqti-perfd-client.so libadsprpc.so +libcdsprpc.so +libsdsprpc.so +libfastcvopt.so libOpenCL.so diff --git a/configs/qti_whitelist.xml b/configs/qti_whitelist.xml index 131953b..ef60d81 100644 --- a/configs/qti_whitelist.xml +++ b/configs/qti_whitelist.xml @@ -1,7 +1,7 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/configs/sec_config b/configs/sec_config index 9f8fe23..4825eb2 100644 --- a/configs/sec_config +++ b/configs/sec_config @@ -318,6 +318,7 @@ /*SERVREG_NOTIF*/ 64:4294967295:1001 66:4294967295:1001 +73:4294967295:1001 /*LTE*/ 70:4294967295:1001 /* Allow Data dpmd to access QMI DFS */ diff --git a/configs/whitelistedapps.xml b/configs/whitelistedapps.xml deleted file mode 100644 index 06e3874..0000000 --- a/configs/whitelistedapps.xml +++ /dev/null @@ -1,63 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/sdm660.mk b/sdm660.mk index fd67994..00698c2 100644 --- a/sdm660.mk +++ b/sdm660.mk @@ -370,8 +370,7 @@ PRODUCT_COPY_FILES += \ # Low power Whitelist PRODUCT_COPY_FILES += \ - $(COMMON_PATH)/configs/qti_whitelist.xml:system/etc/sysconfig/qti_whitelist.xml \ - $(COMMON_PATH)/configs/whitelistedapps.xml:$(TARGET_COPY_OUT_VENDOR)/etc/perf/whitelistedapps.xml \ + $(COMMON_PATH)/configs/qti_whitelist.xml:system/etc/sysconfig/qti_whitelist.xml # QMI PRODUCT_PACKAGES += \ -- cgit v1.2.3