summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorrazorloves <razorloves@gmail.com>2019-03-09 00:54:50 -0600
committerrazorloves <razorloves@gmail.com>2019-03-09 00:54:50 -0600
commit0d0420da02ea2bb6e730c5d8f7830bba4cb1b3c1 (patch)
tree489f7f7d3b458dde79b48b1b8fb6889e5be76143
parent554d51a0be5d198896db72b612ab306b5e15896a (diff)
marlin/sailfish: Update proprietary files
Change-Id: Ifc131f98803f874be1bede3d2756709bc4b68dc2
-rw-r--r--Android.mk10
-rw-r--r--marlin/device-proprietary-files-vendor.txt4
-rw-r--r--marlin/device-proprietary-files.txt23
-rw-r--r--sailfish/device-proprietary-files-vendor.txt4
-rw-r--r--sailfish/device-proprietary-files.txt23
5 files changed, 62 insertions, 2 deletions
diff --git a/Android.mk b/Android.mk
index 49666035..14d69283 100644
--- a/Android.mk
+++ b/Android.mk
@@ -39,4 +39,14 @@ $(IMS_SYMLINKS): $(LOCAL_INSTALLED_MODULE)
ALL_DEFAULT_INSTALLED_MODULES += $(IMS_SYMLINKS)
+DM_LIBS := libdmengine.so libdmjavaplugin.so
+DM_SYMLINKS := $(addprefix $(TARGET_OUT)/priv-app/DMService/lib/arm/,$(notdir $(DM_LIBS)))
+$(DM_SYMLINKS): $(LOCAL_INSTALLED_MODULE)
+ @echo "DMService lib link: $@"
+ @mkdir -p $(dir $@)
+ @rm -rf $@
+ $(hide) ln -sf /system/lib/$(notdir $@) $@
+
+ALL_DEFAULT_INSTALLED_MODULES += $(DM_SYMLINKS)
+
endif
diff --git a/marlin/device-proprietary-files-vendor.txt b/marlin/device-proprietary-files-vendor.txt
index f372b018..eca05d11 100644
--- a/marlin/device-proprietary-files-vendor.txt
+++ b/marlin/device-proprietary-files-vendor.txt
@@ -99,6 +99,10 @@ vendor/etc/izat.conf
vendor/etc/lowi.conf
vendor/etc/modem_stat.conf
vendor/etc/perf-profile0.conf
+vendor/etc/permissions/LowPowerMonitorDeviceInterface.xml
+vendor/etc/permissions/LowPowerMonitorDeviceStub.xml
+vendor/etc/permissions/PowerAnomalyDataModemInterface.xml
+vendor/etc/permissions/PowerAnomalyStub.xml
vendor/etc/permissions/embms.xml
vendor/etc/permissions/qcrilhook.xml
vendor/etc/permissions/qti_permissions.xml
diff --git a/marlin/device-proprietary-files.txt b/marlin/device-proprietary-files.txt
index 72626e5f..47a84316 100644
--- a/marlin/device-proprietary-files.txt
+++ b/marlin/device-proprietary-files.txt
@@ -13,6 +13,9 @@ etc/cne/Nexus/ATT/ATT_profiles.xml
etc/cne/Nexus/ROW/ROW_profiles.xml
etc/cne/Nexus/VZW/VZW_profiles.xml
+# DRM
+bin/move_widevine_data.sh
+
# Hotword Enrollment
-priv-app/HotwordEnrollmentOKGoogleWCD9335/HotwordEnrollmentOKGoogleWCD9335.apk;PRESIGNED
-priv-app/HotwordEnrollmentTGoogleWCD9335/HotwordEnrollmentTGoogleWCD9335.apk;PRESIGNED
@@ -38,13 +41,24 @@ lib/librcc.so
etc/permissions/privapp-permissions-google.xml
# RIL
+-framework/LowPowerMonitorDeviceInterface.jar
+-framework/LowPowerMonitorDeviceStub.jar
+-framework/PowerAnomalyDataModemInterface.jar
+-framework/PowerAnomalyStub.jar
-framework/qcrilhook.jar
+-priv-app/Asdiv/Asdiv.apk
-priv-app/qcrilmsgtunnel/qcrilmsgtunnel.apk
lib64/vendor.qti.atcmdfwd@1.0.so
lib64/vendor.qti.qcril.am@1.0.so
# Sprint
+etc/permissions/com.android.omadm.service.xml
etc/permissions/com.android.sdm.plugins.sprintdm.xml
+etc/sysconfig/whitelist_com.android.omadm.service.xml
+lib/libdmengine.so
+lib/libdmjavaplugin.so
+-priv-app/DMService/DMService.apk
+-priv-app/DiagMon/DiagMon.apk
-priv-app/SprintDM/SprintDM.apk
-priv-app/SprintHM/SprintHM.apk
@@ -54,17 +68,24 @@ etc/sysconfig/pixel_2016_exclusive.xml
# VZW
-app/VZWAPNLib/VZWAPNLib.apk;PRESIGNED
+etc/permissions/com.android.sdm.plugins.connmo.xml
etc/permissions/com.android.vzwomatrigger.xml
etc/permissions/com.verizon.apn.xml
etc/permissions/com.verizon.embms.xml
-etc/permissions/com.verizon.llkagent.xml
etc/permissions/com.verizon.provider.xml
etc/permissions/com.verizon.services.xml
etc/permissions/features-verizon.xml
+etc/permissions/obdm_permissions.xml
etc/permissions/vzw_mvs_permissions.xml
-framework/VerizonUnifiedSettings.jar;PRESIGNED
+-priv-app/CarrierSetup/CarrierSetup.apk
+-priv-app/ConnMO/ConnMO.apk
+-priv-app/DCMO/DCMO.apk
priv-app/MyVerizonServices/lib/arm64/libmotricity.so
-priv-app/MyVerizonServices/MyVerizonServices.apk;PRESIGNED
+-priv-app/OBDM_Permissions/OBDM_Permissions.apk
+-priv-app/OemDmTrigger/OemDmTrigger.apk
-priv-app/VerizonAuthDialog/VerizonAuthDialog.apk;PRESIGNED
-priv-app/VzwOmaTrigger/VzwOmaTrigger.apk;PRESIGNED
-priv-app/WfcActivation/WfcActivation.apk;PRESIGNED
+-priv-app/obdm_stub/obdm_stub.apk;PRESIGNED
diff --git a/sailfish/device-proprietary-files-vendor.txt b/sailfish/device-proprietary-files-vendor.txt
index 6729cb99..96ee41f3 100644
--- a/sailfish/device-proprietary-files-vendor.txt
+++ b/sailfish/device-proprietary-files-vendor.txt
@@ -99,6 +99,10 @@ vendor/etc/izat.conf
vendor/etc/lowi.conf
vendor/etc/modem_stat.conf
vendor/etc/perf-profile0.conf
+vendor/etc/permissions/LowPowerMonitorDeviceInterface.xml
+vendor/etc/permissions/LowPowerMonitorDeviceStub.xml
+vendor/etc/permissions/PowerAnomalyDataModemInterface.xml
+vendor/etc/permissions/PowerAnomalyStub.xml
vendor/etc/permissions/embms.xml
vendor/etc/permissions/qcrilhook.xml
vendor/etc/permissions/qti_permissions.xml
diff --git a/sailfish/device-proprietary-files.txt b/sailfish/device-proprietary-files.txt
index 72626e5f..47a84316 100644
--- a/sailfish/device-proprietary-files.txt
+++ b/sailfish/device-proprietary-files.txt
@@ -13,6 +13,9 @@ etc/cne/Nexus/ATT/ATT_profiles.xml
etc/cne/Nexus/ROW/ROW_profiles.xml
etc/cne/Nexus/VZW/VZW_profiles.xml
+# DRM
+bin/move_widevine_data.sh
+
# Hotword Enrollment
-priv-app/HotwordEnrollmentOKGoogleWCD9335/HotwordEnrollmentOKGoogleWCD9335.apk;PRESIGNED
-priv-app/HotwordEnrollmentTGoogleWCD9335/HotwordEnrollmentTGoogleWCD9335.apk;PRESIGNED
@@ -38,13 +41,24 @@ lib/librcc.so
etc/permissions/privapp-permissions-google.xml
# RIL
+-framework/LowPowerMonitorDeviceInterface.jar
+-framework/LowPowerMonitorDeviceStub.jar
+-framework/PowerAnomalyDataModemInterface.jar
+-framework/PowerAnomalyStub.jar
-framework/qcrilhook.jar
+-priv-app/Asdiv/Asdiv.apk
-priv-app/qcrilmsgtunnel/qcrilmsgtunnel.apk
lib64/vendor.qti.atcmdfwd@1.0.so
lib64/vendor.qti.qcril.am@1.0.so
# Sprint
+etc/permissions/com.android.omadm.service.xml
etc/permissions/com.android.sdm.plugins.sprintdm.xml
+etc/sysconfig/whitelist_com.android.omadm.service.xml
+lib/libdmengine.so
+lib/libdmjavaplugin.so
+-priv-app/DMService/DMService.apk
+-priv-app/DiagMon/DiagMon.apk
-priv-app/SprintDM/SprintDM.apk
-priv-app/SprintHM/SprintHM.apk
@@ -54,17 +68,24 @@ etc/sysconfig/pixel_2016_exclusive.xml
# VZW
-app/VZWAPNLib/VZWAPNLib.apk;PRESIGNED
+etc/permissions/com.android.sdm.plugins.connmo.xml
etc/permissions/com.android.vzwomatrigger.xml
etc/permissions/com.verizon.apn.xml
etc/permissions/com.verizon.embms.xml
-etc/permissions/com.verizon.llkagent.xml
etc/permissions/com.verizon.provider.xml
etc/permissions/com.verizon.services.xml
etc/permissions/features-verizon.xml
+etc/permissions/obdm_permissions.xml
etc/permissions/vzw_mvs_permissions.xml
-framework/VerizonUnifiedSettings.jar;PRESIGNED
+-priv-app/CarrierSetup/CarrierSetup.apk
+-priv-app/ConnMO/ConnMO.apk
+-priv-app/DCMO/DCMO.apk
priv-app/MyVerizonServices/lib/arm64/libmotricity.so
-priv-app/MyVerizonServices/MyVerizonServices.apk;PRESIGNED
+-priv-app/OBDM_Permissions/OBDM_Permissions.apk
+-priv-app/OemDmTrigger/OemDmTrigger.apk
-priv-app/VerizonAuthDialog/VerizonAuthDialog.apk;PRESIGNED
-priv-app/VzwOmaTrigger/VzwOmaTrigger.apk;PRESIGNED
-priv-app/WfcActivation/WfcActivation.apk;PRESIGNED
+-priv-app/obdm_stub/obdm_stub.apk;PRESIGNED