joy/android_device_sony_tama-common
Watch
1
Fork
You've already forked android_device_sony_tama-common
 0
Code Issues Pull requests Projects Releases Wiki Activity

tama-common: Move telephony packages to /system_ext

Browse source 
Change-Id: I38329f6d4ebb7b1a0b0f01e40918fdb73ccbcba9
This commit is contained in:
Bruno Martins 2020-11-25 10:30:20 +00:00 • committed by Danny Trunk
commit b6166f6811
7 changed files with 104 additions and 119 deletions
Download patch file Download diff file Expand all files Collapse all files

10
Android.mk
View file

@ -30,6 +30,16 @@ $(DSP_MOUNT_POINT): $(LOCAL_INSTALLED_MODULE)
ALL_DEFAULT_INSTALLED_MODULES += $(FIRMWARE_MOUNT_POINT) $(BT_FIRMWARE_MOUNT_POINT) $(DSP_MOUNT_POINT)
IMS_LIBS := libimscamera_jni.so libimsmedia_jni.so
IMS_SYMLINKS := $(addprefix $(TARGET_OUT_SYSTEM_EXT_APPS_PRIVILEGED)/ims/lib/arm64/,$(notdir $(IMS_LIBS)))
$(IMS_SYMLINKS): $(LOCAL_INSTALLED_MODULE)
@echo "IMS lib link: $@"
@mkdir -p $(dir $@)
@rm -rf $@
$(hide) ln -sf /system_ext/lib64/$(notdir $@) $@
ALL_DEFAULT_INSTALLED_MODULES += $(IMS_SYMLINKS)
WCNSS_INI_SYMLINK := $(TARGET_OUT_VENDOR)/firmware/wlan/qca_cld/WCNSS_qcom_cfg.ini
$(WCNSS_INI_SYMLINK): $(LOCAL_INSTALLED_MODULE)
@echo "WCNSS config ini link: $@"

3
common.mk
View file

@ -353,8 +353,7 @@ PRODUCT_PACKAGES += \
libqti_vndfwk_detect.vendor
PRODUCT_COPY_FILES += \
$(LOCAL_PATH)/configs/qti_whitelist.xml:$(TARGET_COPY_OUT_SYSTEM_EXT)/etc/sysconfig/qti_whitelist.xml \
$(LOCAL_PATH)/permissions/privapp-permissions-qti.xml:$(TARGET_COPY_OUT_PRODUCT)/etc/permissions/privapp-permissions-qti.xml \
$(LOCAL_PATH)/configs/qti_whitelist.xml:$(TARGET_COPY_OUT_SYSTEM)/etc/sysconfig/qti_whitelist.xml \
$(LOCAL_PATH)/permissions/system_ext-privapp-permissions-qti.xml:$(TARGET_COPY_OUT_SYSTEM_EXT)/etc/permissions/privapp-permissions-qti.xml
# Radio

17
extract-files.sh
View file

@ -23,6 +23,20 @@ source "${HELPER}"
function blob_fixup() {
case "${1}" in
system_ext/etc/permissions/com.qualcomm.qti.imscmservice-V2.0-java.xml)
;&
system_ext/etc/permissions/com.qualcomm.qti.imscmservice-V2.1-java.xml)
;&
system_ext/etc/permissions/com.qualcomm.qti.imscmservice-V2.2-java.xml)
;&
system_ext/etc/permissions/qcrilhook.xml)
;&
system_ext/etc/permissions/telephonyservice.xml)
sed -i "s/\/product\/framework\//\/system_ext\/framework\//g" "${2}"
;;
system_ext/lib64/lib-imsvideocodec.so)
grep -q "libgui_shim.so" "${2}" || "${PATCHELF}" --add-needed "libgui_shim.so" "${2}"
;;
vendor/bin/pm-service)
grep -q libutils-v33.so "${2}" || "${PATCHELF}" --add-needed "libutils-v33.so" "${2}"
;;
@ -36,9 +50,6 @@ function blob_fixup() {
sed -i "s/\/system\/bin\/sony-modem-switcher/\/vendor\/bin\/sony-modem-switcher/" "${2}"
sed -i -r 's/persist\.somc\.cust\.modem(0|1)/persist.vendor.somc.sim\1/' "${2}"
;;
product/lib64/lib-imsvideocodec.so)
grep -q "libgui_shim.so" "${2}" || "${PATCHELF}" --add-needed "libgui_shim.so" "${2}"
;;
esac
}

52
permissions/privapp-permissions-qti.xml
View file

@ -1,52 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
~ Copyright (c) 2017, The Linux Foundation. All rights reserved.
~ Not a Contribution.
-->
<!--
~ Copyright (C) 2016 The Android Open Source Project
~
~ Licensed under the Apache License, Version 2.0 (the "License");
~ you may not use this file except in compliance with the License.
~ You may obtain a copy of the License at
~
~ http://www.apache.org/licenses/LICENSE-2.0
~
~ Unless required by applicable law or agreed to in writing, software
~ distributed under the License is distributed on an "AS IS" BASIS,
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
~ See the License for the specific language governing permissions and
~ limitations under the License
-->
<!--
This XML file declares which signature|privileged permissions should be
granted to privileged applications on QTI devices.
It allows additional grants on top of privapp-permissions-platform.xml
-->
<permissions>
<privapp-permissions package="com.quicinc.cne.CNEService">
<permission name="android.permission.INTERACT_ACROSS_USERS"/>
<permission name="android.permission.PACKET_KEEPALIVE_OFFLOAD"/>
</privapp-permissions>
<privapp-permissions package="com.qti.dpmserviceapp">
<permission name="android.permission.INTERACT_ACROSS_USERS"/>
</privapp-permissions>
<privapp-permissions package="com.qualcomm.qcrilmsgtunnel">
<permission name="android.permission.INTERACT_ACROSS_USERS"/>
</privapp-permissions>
<privapp-permissions package="org.codeaurora.ims">
<permission name="android.permission.MODIFY_PHONE_STATE"/>
<permission name="android.permission.READ_PRECISE_PHONE_STATE"/>
<permission name="android.permission.READ_PRIVILEGED_PHONE_STATE"/>
<permission name="android.permission.INTERACT_ACROSS_USERS"/>
<permission name="android.permission.SUBSTITUTE_NOTIFICATION_APP_NAME"/>
<permission name="android.permission.WRITE_SECURE_SETTINGS" />
</privapp-permissions>
</permissions>

18
permissions/system_ext-privapp-permissions-qti.xml
View file

@ -28,8 +28,26 @@ It allows additional grants on top of privapp-permissions-platform.xml
-->
<permissions>
<privapp-permissions package="com.quicinc.cne.CNEService">
<permission name="android.permission.INTERACT_ACROSS_USERS"/>
<permission name="android.permission.PACKET_KEEPALIVE_OFFLOAD"/>
</privapp-permissions>
<privapp-permissions package="com.qti.dpmserviceapp">
<permission name="android.permission.INTERACT_ACROSS_USERS"/>
</privapp-permissions>
<privapp-permissions package="com.qualcomm.qcrilmsgtunnel">
<permission name="android.permission.INTERACT_ACROSS_USERS"/>
</privapp-permissions>
<privapp-permissions package="com.qualcomm.wfd.service">
<permission name="android.permission.READ_FRAME_BUFFER"/>
<permission name="android.permission.WRITE_MEDIA_STORAGE"/>
</privapp-permissions>
<privapp-permissions package="org.codeaurora.ims">
<permission name="android.permission.MODIFY_PHONE_STATE"/>
<permission name="android.permission.READ_PRECISE_PHONE_STATE"/>
<permission name="android.permission.READ_PRIVILEGED_PHONE_STATE"/>
<permission name="android.permission.INTERACT_ACROSS_USERS"/>
<permission name="android.permission.SUBSTITUTE_NOTIFICATION_APP_NAME"/>
<permission name="android.permission.WRITE_SECURE_SETTINGS" />
</privapp-permissions>
</permissions>

122
proprietary-files.txt
View file

@ -717,58 +717,58 @@ vendor/lib64/libprotobuf-c-idd.so
vendor/lib64/vendor.semc.system.idd@1.0.so
# IMS
product/app/uceShimService/uceShimService.apk
product/etc/permissions/com.qualcomm.qti.imscmservice-V2.0-java.xml
product/etc/permissions/com.qualcomm.qti.imscmservice-V2.1-java.xml
product/etc/permissions/com.qualcomm.qti.imscmservice-V2.2-java.xml
product/framework/com.qualcomm.qti.imscmservice-V2.0-java.jar
product/framework/com.qualcomm.qti.imscmservice-V2.1-java.jar
product/framework/com.qualcomm.qti.imscmservice-V2.2-java.jar
product/lib/com.qualcomm.qti.imscmservice@1.0.so
product/lib/com.qualcomm.qti.imscmservice@2.0.so
product/lib/com.qualcomm.qti.imscmservice@2.1.so
product/lib/com.qualcomm.qti.imscmservice@2.2.so
product/lib/com.qualcomm.qti.uceservice@2.0.so
product/lib/com.qualcomm.qti.uceservice@2.1.so
product/lib/lib-imsvideocodec.so
product/lib/lib-imsvt.so
product/lib/lib-imsvtextutils.so
product/lib/lib-imsvtutils.so
product/lib/libdiag_system.so
product/lib/libimscamera_jni.so
product/lib/libimsmedia_jni.so
product/lib/vendor.qti.hardware.radio.ims@1.0.so
product/lib/vendor.qti.hardware.radio.ims@1.1.so
product/lib/vendor.qti.hardware.radio.ims@1.2.so
product/lib/vendor.qti.hardware.radio.ims@1.3.so
product/lib/vendor.qti.hardware.radio.ims@1.4.so
product/lib/vendor.qti.ims.callinfo@1.0.so
product/lib/vendor.qti.ims.rcsconfig@1.0.so
product/lib/vendor.qti.imsrtpservice@2.0.so
product/lib/vendor.qti.imsrtpservice@2.1.so
product/lib64/com.qualcomm.qti.imscmservice@1.0.so
product/lib64/com.qualcomm.qti.imscmservice@2.0.so
product/lib64/com.qualcomm.qti.imscmservice@2.1.so
product/lib64/com.qualcomm.qti.imscmservice@2.2.so
product/lib64/com.qualcomm.qti.uceservice@2.0.so
product/lib64/com.qualcomm.qti.uceservice@2.1.so
product/lib64/lib-imsvideocodec.so
product/lib64/lib-imsvt.so
product/lib64/lib-imsvtextutils.so
product/lib64/lib-imsvtutils.so
product/lib64/libdiag_system.so
product/lib64/libimscamera_jni.so
product/lib64/libimsmedia_jni.so
product/lib64/vendor.qti.hardware.radio.ims@1.0.so
product/lib64/vendor.qti.hardware.radio.ims@1.1.so
product/lib64/vendor.qti.hardware.radio.ims@1.2.so
product/lib64/vendor.qti.hardware.radio.ims@1.3.so
product/lib64/vendor.qti.hardware.radio.ims@1.4.so
product/lib64/vendor.qti.ims.callinfo@1.0.so
product/lib64/vendor.qti.ims.rcsconfig@1.0.so
product/lib64/vendor.qti.imsrtpservice@2.0.so
product/lib64/vendor.qti.imsrtpservice@2.1.so
product/priv-app/ims/ims.apk
product/app/uceShimService/uceShimService.apk:system_ext/app/uceShimService/uceShimService.apk
product/etc/permissions/com.qualcomm.qti.imscmservice-V2.0-java.xml:system_ext/etc/permissions/com.qualcomm.qti.imscmservice-V2.0-java.xml
product/etc/permissions/com.qualcomm.qti.imscmservice-V2.1-java.xml:system_ext/etc/permissions/com.qualcomm.qti.imscmservice-V2.1-java.xml
product/etc/permissions/com.qualcomm.qti.imscmservice-V2.2-java.xml:system_ext/etc/permissions/com.qualcomm.qti.imscmservice-V2.2-java.xml
product/framework/com.qualcomm.qti.imscmservice-V2.0-java.jar:system_ext/framework/com.qualcomm.qti.imscmservice-V2.0-java.jar
product/framework/com.qualcomm.qti.imscmservice-V2.1-java.jar:system_ext/framework/com.qualcomm.qti.imscmservice-V2.1-java.jar
product/framework/com.qualcomm.qti.imscmservice-V2.2-java.jar:system_ext/framework/com.qualcomm.qti.imscmservice-V2.2-java.jar
product/lib/com.qualcomm.qti.imscmservice@1.0.so:system_ext/lib/com.qualcomm.qti.imscmservice@1.0.so
product/lib/com.qualcomm.qti.imscmservice@2.0.so:system_ext/lib/com.qualcomm.qti.imscmservice@2.0.so
product/lib/com.qualcomm.qti.imscmservice@2.1.so:system_ext/lib/com.qualcomm.qti.imscmservice@2.1.so
product/lib/com.qualcomm.qti.imscmservice@2.2.so:system_ext/lib/com.qualcomm.qti.imscmservice@2.2.so
product/lib/com.qualcomm.qti.uceservice@2.0.so:system_ext/lib/com.qualcomm.qti.uceservice@2.0.so
product/lib/com.qualcomm.qti.uceservice@2.1.so:system_ext/lib/com.qualcomm.qti.uceservice@2.1.so
product/lib/lib-imsvideocodec.so:system_ext/lib/lib-imsvideocodec.so
product/lib/lib-imsvt.so:system_ext/lib/lib-imsvt.so
product/lib/lib-imsvtextutils.so:system_ext/lib/lib-imsvtextutils.so
product/lib/lib-imsvtutils.so:system_ext/lib/lib-imsvtutils.so
product/lib/libdiag_system.so:system_ext/lib/libdiag_system.so
product/lib/libimscamera_jni.so:system_ext/lib/libimscamera_jni.so
product/lib/libimsmedia_jni.so:system_ext/lib/libimsmedia_jni.so
product/lib/vendor.qti.hardware.radio.ims@1.0.so:system_ext/lib/vendor.qti.hardware.radio.ims@1.0.so
product/lib/vendor.qti.hardware.radio.ims@1.1.so:system_ext/lib/vendor.qti.hardware.radio.ims@1.1.so
product/lib/vendor.qti.hardware.radio.ims@1.2.so:system_ext/lib/vendor.qti.hardware.radio.ims@1.2.so
product/lib/vendor.qti.hardware.radio.ims@1.3.so:system_ext/lib/vendor.qti.hardware.radio.ims@1.3.so
product/lib/vendor.qti.hardware.radio.ims@1.4.so:system_ext/lib/vendor.qti.hardware.radio.ims@1.4.so
product/lib/vendor.qti.ims.callinfo@1.0.so:system_ext/lib/vendor.qti.ims.callinfo@1.0.so
product/lib/vendor.qti.ims.rcsconfig@1.0.so:system_ext/lib/vendor.qti.ims.rcsconfig@1.0.so
product/lib/vendor.qti.imsrtpservice@2.0.so:system_ext/lib/vendor.qti.imsrtpservice@2.0.so
product/lib/vendor.qti.imsrtpservice@2.1.so:system_ext/lib/vendor.qti.imsrtpservice@2.1.so
product/lib64/com.qualcomm.qti.imscmservice@1.0.so:system_ext/lib64/com.qualcomm.qti.imscmservice@1.0.so
product/lib64/com.qualcomm.qti.imscmservice@2.0.so:system_ext/lib64/com.qualcomm.qti.imscmservice@2.0.so
product/lib64/com.qualcomm.qti.imscmservice@2.1.so:system_ext/lib64/com.qualcomm.qti.imscmservice@2.1.so
product/lib64/com.qualcomm.qti.imscmservice@2.2.so:system_ext/lib64/com.qualcomm.qti.imscmservice@2.2.so
product/lib64/com.qualcomm.qti.uceservice@2.0.so:system_ext/lib64/com.qualcomm.qti.uceservice@2.0.so
product/lib64/com.qualcomm.qti.uceservice@2.1.so:system_ext/lib64/com.qualcomm.qti.uceservice@2.1.so
product/lib64/lib-imsvideocodec.so:system_ext/lib64/lib-imsvideocodec.so
product/lib64/lib-imsvt.so:system_ext/lib64/lib-imsvt.so
product/lib64/lib-imsvtextutils.so:system_ext/lib64/lib-imsvtextutils.so
product/lib64/lib-imsvtutils.so:system_ext/lib64/lib-imsvtutils.so
product/lib64/libdiag_system.so:system_ext/lib64/libdiag_system.so
product/lib64/libimscamera_jni.so:system_ext/lib64/libimscamera_jni.so
product/lib64/libimsmedia_jni.so:system_ext/lib64/libimsmedia_jni.so
product/lib64/vendor.qti.hardware.radio.ims@1.0.so:system_ext/lib64/vendor.qti.hardware.radio.ims@1.0.so
product/lib64/vendor.qti.hardware.radio.ims@1.1.so:system_ext/lib64/vendor.qti.hardware.radio.ims@1.1.so
product/lib64/vendor.qti.hardware.radio.ims@1.2.so:system_ext/lib64/vendor.qti.hardware.radio.ims@1.2.so
product/lib64/vendor.qti.hardware.radio.ims@1.3.so:system_ext/lib64/vendor.qti.hardware.radio.ims@1.3.so
product/lib64/vendor.qti.hardware.radio.ims@1.4.so:system_ext/lib64/vendor.qti.hardware.radio.ims@1.4.so
product/lib64/vendor.qti.ims.callinfo@1.0.so:system_ext/lib64/vendor.qti.ims.callinfo@1.0.so
product/lib64/vendor.qti.ims.rcsconfig@1.0.so:system_ext/lib64/vendor.qti.ims.rcsconfig@1.0.so
product/lib64/vendor.qti.imsrtpservice@2.0.so:system_ext/lib64/vendor.qti.imsrtpservice@2.0.so
product/lib64/vendor.qti.imsrtpservice@2.1.so:system_ext/lib64/vendor.qti.imsrtpservice@2.1.so
product/priv-app/ims/ims.apk:system_ext/priv-app/ims/ims.apk
vendor/bin/ims_rtp_daemon
vendor/bin/imsdatadaemon
vendor/bin/imsqmidaemon
@ -1027,8 +1027,8 @@ system/etc/permissions/privapp-permissions-qti.xml
system/etc/permissions/privapp-permissions-sony.xml
# QMI
system/etc/permissions/qti_libpermissions.xml
system/etc/permissions/qti_permissions.xml
system/etc/permissions/qti_libpermissions.xml:system_ext/etc/permissions/qti_libpermissions.xml
system/etc/permissions/qti_permissions.xml:system_ext/etc/permissions/qti_permissions.xml
vendor/bin/irsc_util
vendor/bin/mlog_qmi_service
vendor/etc/sec_config
@ -1072,14 +1072,14 @@ vendor/lib64/hw/com.qualcomm.qti.ant@1.0-impl.so
vendor/lib64/com.qualcomm.qti.ant@1.0.so
# RIL
product/app/QtiTelephonyService/QtiTelephonyService.apk
product/etc/permissions/qcrilhook.xml
product/etc/permissions/telephonyservice.xml
product/framework/QtiTelephonyServicelibrary.jar
product/framework/qcrilhook.jar
product/app/QtiTelephonyService/QtiTelephonyService.apk:system_ext/app/QtiTelephonyService/QtiTelephonyService.apk
product/etc/permissions/qcrilhook.xml:system_ext/etc/permissions/qcrilhook.xml
product/etc/permissions/telephonyservice.xml:system_ext/etc/permissions/telephonyservice.xml
product/framework/QtiTelephonyServicelibrary.jar:system_ext/framework/QtiTelephonyServicelibrary.jar
product/framework/qcrilhook.jar:system_ext/framework/qcrilhook.jar
# Taken from polaris - QKQ1.190828.002
product/framework/qti-telephony-common.jar|91fe0ce296fc29bece6df81070b9b3b4ee41a1b4
product/priv-app/qcrilmsgtunnel/qcrilmsgtunnel.apk
product/framework/qti-telephony-common.jar:system_ext/framework/qti-telephony-common.jar|91fe0ce296fc29bece6df81070b9b3b4ee41a1b4
product/priv-app/qcrilmsgtunnel/qcrilmsgtunnel.apk:system_ext/priv-app/qcrilmsgtunnel/qcrilmsgtunnel.apk
vendor/app/IWlanService/IWlanService.apk
vendor/bin/hw/qcrild
vendor/bin/ATFWD-daemon

1
sepolicy/private/file_contexts
View file

@ -1 +0,0 @@
/system/product/bin/dpmd u:object_r:vendor_dpmd_exec:s0