summaryrefslogtreecommitdiff
authorshipeng.sun <shipeng.sun@amlogic.com>2020-11-19 15:19:33 (GMT)
committer Shipeng Sun <shipeng.sun@amlogic.com>2020-11-20 03:28:37 (GMT)
commit320ed1a298654ff6bbb1192ff0f458c64b26139e (patch)
tree0492fd08b6f5b4ed877a836dc1b6a351b4dc593e
parent6cff71d9da30099cb6ad735054481a3985e220e6 (diff)
downloadcommon-320ed1a298654ff6bbb1192ff0f458c64b26139e.zip
common-320ed1a298654ff6bbb1192ff0f458c64b26139e.tar.gz
common-320ed1a298654ff6bbb1192ff0f458c64b26139e.tar.bz2
PlayReady: Playready Support HIDL Service [2/2]
PD#SWPL-36921 Problem: Playready Support HIDL Service Solution: 1. Support playready hidl service 1.3 Verify: Verified local Change-Id: I5f0fbff97adabd6573e63a3b7281f4cf36d61b47
Diffstat
-rw-r--r--core_amlogic.mk3
-rw-r--r--hidl_manifests/manifest_common.xml4
-rw-r--r--[-rwxr-xr-x]hidl_manifests/newdevices/manifest_common.xml2
-rw-r--r--[-rwxr-xr-x]sepolicy/file_contexts1
4 files changed, 9 insertions, 1 deletions
diff --git a/core_amlogic.mk b/core_amlogic.mk
index e23db81..e2d0d2c 100644
--- a/core_amlogic.mk
+++ b/core_amlogic.mk
@@ -435,7 +435,8 @@ endif
PRODUCT_PACKAGES += \
android.hardware.drm@1.3-service.widevine \
android.hardware.drm@1.3-service.clearkey \
- move_widevine_data.sh
+ move_widevine_data.sh \
+ android.hardware.drm@1.3-service.playready
# HDMITX CEC HAL
PRODUCT_PACKAGES += \
diff --git a/hidl_manifests/manifest_common.xml b/hidl_manifests/manifest_common.xml
index 01da050..87fbda7 100644
--- a/hidl_manifests/manifest_common.xml
+++ b/hidl_manifests/manifest_common.xml
@@ -110,16 +110,20 @@
<name>ICryptoFactory</name>
<instance>default</instance>
<instance>widevine</instance>
+ <instance>playready</instance>
</interface>
<interface>
<name>IDrmFactory</name>
<instance>default</instance>
<instance>widevine</instance>
+ <instance>playready</instance>
</interface>
<fqname>@1.3::ICryptoFactory/clearkey</fqname>
<fqname>@1.3::IDrmFactory/clearkey</fqname>
<fqname>@1.3::ICryptoFactory/widevine</fqname>
<fqname>@1.3::IDrmFactory/widevine</fqname>
+ <fqname>@1.3::ICryptoFactory/playready</fqname>
+ <fqname>@1.3::IDrmFactory/playready</fqname>
</hal>
<hal>
<name>android.hardware.tv.cec</name>
diff --git a/hidl_manifests/newdevices/manifest_common.xml b/hidl_manifests/newdevices/manifest_common.xml
index aa3ad48..039dae5 100755..100644
--- a/hidl_manifests/newdevices/manifest_common.xml
+++ b/hidl_manifests/newdevices/manifest_common.xml
@@ -92,11 +92,13 @@
<name>ICryptoFactory</name>
<instance>clearkey</instance>
<instance>widevine</instance>
+ <instance>playready</instance>
</interface>
<interface>
<name>IDrmFactory</name>
<instance>clearkey</instance>
<instance>widevine</instance>
+ <instance>playready</instance>
</interface>
</hal>
<hal>
diff --git a/sepolicy/file_contexts b/sepolicy/file_contexts
index 4a21850..8353830 100755..100644
--- a/sepolicy/file_contexts
+++ b/sepolicy/file_contexts
@@ -343,6 +343,7 @@
/vendor/bin/hw/android\.hardware\.health@2\.1-service.droidlogic u:object_r:hal_health_default_exec:s0
/vendor/bin/hw/android\.hardware\.dumpstate@1\.1-service.droidlogic u:object_r:hal_dumpstate_default_exec:s0
/vendor/bin/hw/android\.hardware\.drm@1\.3-service\.widevine u:object_r:hal_drm_default_exec:s0
+/vendor/bin/hw/android\.hardware\.drm@1\.3-service\.playready u:object_r:hal_drm_default_exec:s0
/vendor/bin/hw/android\.hardware\.drm@1\.3-service\.clearkey u:object_r:hal_drm_clearkey_exec:s0
/vendor/bin/hw/android\.hardware\.power\.aidl-service.droidlogic u:object_r:hal_power_default_exec:s0