aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeff Tinker <jtinker@google.com>2018-11-05 15:04:17 -0800
committerDavide Garberi <dade.garberi@gmail.com>2019-11-05 21:38:39 +0100
commit22136b7e4a8ef69394e08ea4ab0e177e8b4eaab7 (patch)
tree447321a2e465048eb4be3a7462506f4a67342ee5
parent7e9d28c0aad4cc2812228d6fc8461724ce306e9b (diff)
msm8996-common: Enable clearkey drm plugin v1.2
test: android.media.cts.MediaDrmClearkeyTest#testOfflineKeyManagement bug: 117570956 bug: 110838441 bug: 116252891 Change-Id: Ie9373543ef416e718a70e75d95bf5b15a2852705
-rw-r--r--manifest.xml4
-rwxr-xr-xmsm8996.mk3
2 files changed, 4 insertions, 3 deletions
diff --git a/manifest.xml b/manifest.xml
index c2fd2e7..2c5b4a8 100644
--- a/manifest.xml
+++ b/manifest.xml
@@ -93,8 +93,8 @@ IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
<instance>default</instance>
<instance>widevine</instance>
</interface>
- <fqname>@1.1::ICryptoFactory/clearkey</fqname>
- <fqname>@1.1::IDrmFactory/clearkey</fqname>
+ <fqname>@1.2::ICryptoFactory/clearkey</fqname>
+ <fqname>@1.2::IDrmFactory/clearkey</fqname>
<fqname>@1.1::ICryptoFactory/widevine</fqname>
<fqname>@1.1::IDrmFactory/widevine</fqname>
</hal>
diff --git a/msm8996.mk b/msm8996.mk
index 5d6d60e..dbea489 100755
--- a/msm8996.mk
+++ b/msm8996.mk
@@ -190,7 +190,8 @@ PRODUCT_PACKAGES += \
# DRM
PRODUCT_PACKAGES += \
android.hardware.drm@1.0-impl \
- android.hardware.drm@1.0-service
+ android.hardware.drm@1.0-service \
+ android.hardware.drm@1.2-service.clearkey
# For config.fs
PRODUCT_PACKAGES += \