From ac3d49d41d84138258c0552c1e6ac6c216a7d043 Mon Sep 17 00:00:00 2001 From: Charlie Chen Date: Wed, 31 Mar 2021 13:48:06 +0000 Subject: [PATCH] Revert "Allow Exoplayer access to the vstream-secure heap for secure playback" This reverts commit 7c926131853d7ae4c01d3403c83c822e6922550a. Reason for revert: This commit breaks camera recording Bug: 184154831 Change-Id: Ia4286dab9c5d44c59a3b224e0e24c191eb2be84b --- whitechapel/vendor/google/file_contexts | 4 ++++ whitechapel/vendor/google/genfs_contexts | 3 --- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/whitechapel/vendor/google/file_contexts b/whitechapel/vendor/google/file_contexts index d1801efd..2a9aaf08 100644 --- a/whitechapel/vendor/google/file_contexts +++ b/whitechapel/vendor/google/file_contexts @@ -420,6 +420,10 @@ /dev/dma_heap/vstream-secure u:object_r:dmabuf_system_secure_heap_device:s0 +# Video sysfs files +/sys/devices/platform/mfc/video4linux/video6/name u:object_r:sysfs_video:s0 +/sys/devices/platform/mfc/video4linux/video7/name u:object_r:sysfs_video:s0 + # BigOcean /dev/bigocean u:object_r:video_device:s0 diff --git a/whitechapel/vendor/google/genfs_contexts b/whitechapel/vendor/google/genfs_contexts index 69e9dd2c..60b9cb2c 100644 --- a/whitechapel/vendor/google/genfs_contexts +++ b/whitechapel/vendor/google/genfs_contexts @@ -243,6 +243,3 @@ genfscon sysfs /devices/platform/bigocean/sscoredump/sscd_bigocean/report_count genfscon sysfs /devices/platform/debugcore/sscoredump/sscd_debugcore/report_count u:object_r:sysfs_sscoredump_subsystem_report_count:s0 genfscon sysfs /devices/platform/mfc-core/sscoredump/sscd_mfc-core/report_count u:object_r:sysfs_sscoredump_subsystem_report_count:s0 genfscon sysfs /devices/platform/wlan/sscoredump/sscd_wlan/report_count u:object_r:sysfs_sscoredump_subsystem_report_count:s0 - -# mediacodec -genfscon sysfs /devices/platform/mfc/video4linux/video u:object_r:sysfs_video:s0