commit a9cb03b9b4be8ae99ef04ae521adb945e125dad3
author Fred Gylys-Colwell <fredgc@google.com> Fri Jan 25 15:44:00 2019 -0800
committer Fred Gylys-Colwell <fredgc@google.com> Fri Feb 01 02:09:27 2019 +0000
tree b66b2b18dd8190e9ba012d2189ce3ad3029b35e0
parent baf59e8fb579bf3a3f9479e738eac59630644167

Revert: Update Widevine HIDL service to 1.2.

This keeps the old version of widevine (1.1) for sailfish and marlin.

bug: 118154888
Test: Ran play movies on sailfish

Change-Id: Ie2bd8ca39c0dfe96f5f2e8d96f45f4f651e64d0f

CleanSpec.mk

diff --git a/CleanSpec.mk b/CleanSpec.mk
index 4231f17..5f54c9e 100644
--- a/CleanSpec.mk
+++ b/CleanSpec.mk
@@ -118,3 +118,7 @@
 $(call add-clean-step, rm -rf $(PRODUCT_OUT)/vendor/bin/hw/android.hardware.cas@1.0-service)
 $(call add-clean-step, rm -rf $(PRODUCT_OUT)/vendor/etc/init/android.hardware.cas@1.0-service.rc)
 $(call add-clean-step, rm -rf $(PRODUCT_OUT)/vendor/etc/vintf/manifest/android.hardware.cas@1.0-service.xml)
+
+# Don't upgrade to Widevine HIDL 1.2 after all.  Stay with 1.1.
+$(call add-clean-step, rm -rf $(PRODUCT_OUT)/vendor/etc/init/android.hardware.drm@1.2-service.widevine.rc)
+$(call add-clean-step, rm -rf $(PRODUCT_OUT)/vendor/bin/hw/android.hardware.drm@1.2-service.widevine)

manifest.xml

diff --git a/manifest.xml b/manifest.xml
index c90d6d1..8637209 100644
--- a/manifest.xml
+++ b/manifest.xml
@@ -85,8 +85,8 @@
         </interface>
         <fqname>@1.2::ICryptoFactory/clearkey</fqname>
         <fqname>@1.2::IDrmFactory/clearkey</fqname>
-        <fqname>@1.2::ICryptoFactory/widevine</fqname>
-        <fqname>@1.2::IDrmFactory/widevine</fqname>
+        <fqname>@1.1::ICryptoFactory/widevine</fqname>
+        <fqname>@1.1::IDrmFactory/widevine</fqname>
     </hal>
     <hal format="hidl">
         <name>android.hardware.dumpstate</name>
@@ -332,4 +332,3 @@
     </hal>
 
 </manifest>
-

sepolicy/file_contexts

diff --git a/sepolicy/file_contexts b/sepolicy/file_contexts
index 3ebdfbb..7aecee3 100644
--- a/sepolicy/file_contexts
+++ b/sepolicy/file_contexts
@@ -112,8 +112,8 @@
 
 # files in /vendor
 /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\.2-service\.widevine          u:object_r:hal_drm_widevine_exec:s0
-/vendor/bin/hw/android\.hardware\.drm@1\.2-service-lazy\.widevine     u:object_r:hal_drm_widevine_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-lazy\.widevine     u:object_r:hal_drm_widevine_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\.drm@1\.2-service-lazy\.clearkey     u:object_r:hal_drm_clearkey_exec:s0
 /vendor/bin/hw/android\.hardware\.dumpstate@1\.0-service\.marlin      u:object_r:hal_dumpstate_impl_exec:s0