diff options
| author | Jeffrey Vander Stoep <jeffv@google.com> | 2016-01-15 17:47:56 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2016-01-15 17:47:56 +0000 |
| commit | 9d9fee956a9c4c7be4f69f7a472d3fc0e759c2dd (patch) | |
| tree | a9820e3fa6047184ab8e9f95f7d0c67de40f2c72 | |
| parent | ee780e84e949de92267d510f7e03aa493d90a3b4 (diff) | |
| parent | 07c9e60de02caf69db7bfcebb75308803ca0f702 (diff) | |
| download | flo-nougat-mr1-wear-release.tar.gz | |
Merge "camera_device: remove type"HEADandroid-wear-n-preview-3android-wear-n-preview-2android-wear-n-preview-1android-wear-7.1.1_r1android-n-preview-5android-n-preview-4android-n-preview-3android-n-preview-2android-n-preview-1android-n-mr2-preview-2android-n-mr2-preview-1android-n-mr1-preview-2android-n-mr1-preview-1android-n-iot-preview-2nougat-mr1-wear-releasen-iot-preview-2mastermain
| -rw-r--r-- | sepolicy/camera.te | 4 | ||||
| -rw-r--r-- | sepolicy/file_contexts | 9 |
2 files changed, 6 insertions, 7 deletions
diff --git a/sepolicy/camera.te b/sepolicy/camera.te index aa20255..2433061 100644 --- a/sepolicy/camera.te +++ b/sepolicy/camera.te @@ -6,8 +6,8 @@ type camera_exec, exec_type, file_type; init_daemon_domain(camera) # Interact with other media devices -allow camera camera_device:dir search; -allow camera { gpu_device video_device camera_device }:chr_file rw_file_perms; +allow camera video_device:dir search; +allow camera { gpu_device video_device }:chr_file rw_file_perms; allow camera { surfaceflinger mediaserver }:fd use; # Create front and back camera sockets (/data/cam_socket[12]) diff --git a/sepolicy/file_contexts b/sepolicy/file_contexts index b453823..b0d885d 100644 --- a/sepolicy/file_contexts +++ b/sepolicy/file_contexts @@ -72,12 +72,11 @@ /dev/ttyUSB0 u:object_r:radio_device:s0 # Jpeg Engine support -/dev/gemini.* u:object_r:camera_device:s0 +/dev/gemini.* u:object_r:video_device:s0 # MSM camera related -/dev/v4l-subdev.* u:object_r:camera_device:s0 -/dev/video([0-9])+ u:object_r:camera_device:s0 -/dev/msm_camera(/.*)? u:object_r:camera_device:s0 -/dev/media([0-9])+ u:object_r:camera_device:s0 +/dev/v4l-subdev.* u:object_r:video_device:s0 +/dev/msm_camera(/.*)? u:object_r:video_device:s0 +/dev/media([0-9])+ u:object_r:video_device:s0 # Qualcomm MSM Audio devices /dev/msm_acdb u:object_r:audio_device:s0 |