summaryrefslogtreecommitdiff
authorDan Zhang <danielzhang@google.com>2019-06-04 16:31:37 (GMT)
committer Android Partner Code Review <android-gerrit-partner@google.com>2019-06-04 16:31:37 (GMT)
commitc052a839bcf5aa6e921a0e4071d3e807dd1e0ad0 (patch)
tree805b5eece69070e1bbf545afe9cc526bc730f678
parent5ddf065163edc11bc3e0f659085533c6f544fb83 (diff)
parentc55c14768261998b231c4afe32c9bddf5441e1f2 (diff)
downloadcommon-c052a839bcf5aa6e921a0e4071d3e807dd1e0ad0.zip
common-c052a839bcf5aa6e921a0e4071d3e807dd1e0ad0.tar.gz
common-c052a839bcf5aa6e921a0e4071d3e807dd1e0ad0.tar.bz2
Merge changes from topic "hailstorm" into p-tv-dev
* changes: sepolicy: optimize widevine decryption [1/3] audio: set pcrscr after 2 frames ready [3/3]
Diffstat
-rwxr-xr-xsepolicy/hal_audio_default.te2
-rwxr-xr-xsepolicy/hal_drm_default.te1
2 files changed, 3 insertions, 0 deletions
diff --git a/sepolicy/hal_audio_default.te b/sepolicy/hal_audio_default.te
index 512f4ec..6fb53e6 100755
--- a/sepolicy/hal_audio_default.te
+++ b/sepolicy/hal_audio_default.te
@@ -9,6 +9,8 @@ allow hal_audio_default media_prop:file { read open getattr };
allow hal_audio_default media_prop:property_service { set };
allow hal_audio_default shell_data_file:file { read write };
allow hal_audio_default sysfs_xbmc:file { read open write };
+allow hal_audio_default sysfs_video:file { read open };
+allow hal_audio_default sysfs_video:dir search;
allow hal_audio_default hidraw_device:chr_file { create read write open ioctl};
allow hal_audio_default property_socket:sock_file { write };
allow hal_audio_default init:unix_stream_socket { connectto };
diff --git a/sepolicy/hal_drm_default.te b/sepolicy/hal_drm_default.te
index 1a8fdf8..fc3bc73 100755
--- a/sepolicy/hal_drm_default.te
+++ b/sepolicy/hal_drm_default.te
@@ -4,5 +4,6 @@ allow hal_drm_default vndbinder_device:chr_file { read write open ioctl };
allow hal_drm_default drm_device:chr_file { read open write ioctl };
allow hal_drm_default hal_drm_data:file { read open write getattr create unlink rename };
allow hal_drm_default hal_drm_data:dir { read open write getattr create search add_name remove_name rmdir};
+allow hal_drm_default self:capability sys_nice;
get_prop(hal_drm_default, media_prop)