commit afbb14e338a0d7b6f39a41741ab188de0902c2d9
author Jeff Tinker <jtinker@google.com> Mon Nov 05 15:05:26 2018 -0800
committer Jeff Tinker <jtinker@google.com> Thu Nov 15 01:28:29 2018 +0000
tree 3df3394279a367ca96b7c4600ce073e105ff70f4
parent 4b891cb98d1bf820c250882b92c96b6982c98621

Enable clearkey drm plugin v1.2 on wahoo

bug:117570956
bug:110838441
bug:116252891

test: android.media.cts.MediaDrmClearkeyTest#testOfflineKeyManagement

Change-Id: I03f3e298148dc388f73ce83681434a5802fde68b

device.mk

diff --git a/device.mk b/device.mk
index db1a74b..a4783e5 100755
--- a/device.mk
+++ b/device.mk
@@ -373,7 +373,7 @@
     android.hardware.drm@1.0-impl:32 \
     android.hardware.drm@1.0-service \
     android.hardware.drm@1.1-service.widevine \
-    android.hardware.drm@1.1-service.clearkey \
+    android.hardware.drm@1.2-service.clearkey \
     move_widevine_data.sh
 
 # NFC packages

manifest.xml

diff --git a/manifest.xml b/manifest.xml
index 6cf24ae..65b2cc2 100644
--- a/manifest.xml
+++ b/manifest.xml
@@ -92,8 +92,8 @@
             <name>IDrmFactory</name>
             <instance>default</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>

sepolicy/vendor/file_contexts

diff --git a/sepolicy/vendor/file_contexts b/sepolicy/vendor/file_contexts
index ceb22fb..8f70122 100644
--- a/sepolicy/vendor/file_contexts
+++ b/sepolicy/vendor/file_contexts
@@ -184,7 +184,7 @@
 
 /vendor/bin/hw/android\.hardware\.bluetooth@1\.0-service-qti          u:object_r:hal_bluetooth_default_exec:s0
 /vendor/bin/hw/android\.hardware\.drm@1\.1-service\.widevine          u:object_r:hal_drm_widevine_exec:s0
-/vendor/bin/hw/android\.hardware\.drm@1\.1-service\.clearkey          u:object_r:hal_drm_clearkey_exec:s0
+/vendor/bin/hw/android\.hardware\.drm@1\.2-service\.clearkey          u:object_r:hal_drm_clearkey_exec:s0
 /vendor/bin/hw/android\.hardware\.vibrator@1\.2-service\.wahoo        u:object_r:hal_vibrator_default_exec:s0
 /vendor/bin/hw/android\.hardware\.health@2\.0-service\.wahoo          u:object_r:hal_health_default_exec:s0
 /vendor/bin/hw/android\.hardware\.keymaster@3\.0-service-qti         u:object_r:hal_keymaster_qti_exec:s0

sepolicy/vendor/hal_drm_clearkey.te

diff --git a/sepolicy/vendor/hal_drm_clearkey.te b/sepolicy/vendor/hal_drm_clearkey.te
index 976b9fa..1a3b4af 100644
--- a/sepolicy/vendor/hal_drm_clearkey.te
+++ b/sepolicy/vendor/hal_drm_clearkey.te
@@ -1,4 +1,4 @@
-# policy for /vendor/bin/hw/android.hardware.drm@1.1-service.clearkey
+# policy for /vendor/bin/hw/android.hardware.drm clearkey service
 type hal_drm_clearkey, domain;
 type hal_drm_clearkey_exec, exec_type, vendor_file_type, file_type;