From 2c808c3a58b67723e7396f57008590b560ad35b5 Mon Sep 17 00:00:00 2001 From: Juju Sung Date: Wed, 5 Feb 2020 13:01:38 +0800 Subject: [ALPS04971420] Update drm service executables file_contexts regexp to better support mulitple variant context Bug: 139134043 Test: DeviceManifest/SingleManifestTest.InterfacesAreReleased Test: MediaDrmClearkeyTest Change-Id: Iba8cbb5570b0731746857ba9f9ac578e2c95e450 CR-Id: ALPS04971420 Feature: [Android Default] SELinux, SEAndroid, and SE-MTK --- non_plat/file_contexts | 8 ++++---- r_non_plat/file_contexts | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/non_plat/file_contexts b/non_plat/file_contexts index 6ab1219..c17da3a 100644 --- a/non_plat/file_contexts +++ b/non_plat/file_contexts @@ -673,11 +673,11 @@ /(system\/vendor|vendor)/bin/hw/vendor\.mediatek\.hardware\.hdmi@1\.0-service u:object_r:mtk_hal_hdmi_exec:s0 #Widevine drm hal(include lazy hal) -/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@[0-9]+\.[0-9]+-service\.widevine u:object_r:hal_drm_widevine_exec:s0 +/vendor/bin/hw/android\.hardware\.drm@[0-9]+\.[0-9]+-service-lazy\.widevine u:object_r:hal_drm_widevine_exec:s0 #Cleaarkey hal(include lazy hal) -/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\.drm@[0-9]+\.[0-9]+-service\.clearkey u:object_r:hal_drm_clearkey_exec:s0 +/vendor/bin/hw/android\.hardware\.drm@[0-9]+\.[0-9]+-service-lazy\.clearkey u:object_r:hal_drm_clearkey_exec:s0 # Date : 2019/10/28 diff --git a/r_non_plat/file_contexts b/r_non_plat/file_contexts index e46b83a..4630713 100644 --- a/r_non_plat/file_contexts +++ b/r_non_plat/file_contexts @@ -672,11 +672,11 @@ /(system\/vendor|vendor)/bin/hw/vendor\.mediatek\.hardware\.hdmi@1\.0-service u:object_r:mtk_hal_hdmi_exec:s0 #Widevine drm hal(include lazy hal) -/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@[0-9]+\.[0-9]+-service\.widevine u:object_r:hal_drm_widevine_exec:s0 +/vendor/bin/hw/android\.hardware\.drm@[0-9]+\.[0-9]+-service-lazy\.widevine u:object_r:hal_drm_widevine_exec:s0 #Cleaarkey hal(include lazy hal) -/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\.drm@[0-9]+\.[0-9]+-service\.clearkey u:object_r:hal_drm_clearkey_exec:s0 +/vendor/bin/hw/android\.hardware\.drm@[0-9]+\.[0-9]+-service-lazy\.clearkey u:object_r:hal_drm_clearkey_exec:s0 # Date : 2019/10/28 -- cgit v1.2.3