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 | d5c727fff96ab8bc56255847ce20ed17a8980c9d (patch) | |
| tree | b28cb6972171ff493b9bab80183ebd981351996c | |
| parent | 5325070827a0317b8fc8804b2f786655aa7d86bd (diff) | |
| parent | c41d05dd86021704a2fdc7b7f3b0e17014d80115 (diff) | |
| download | hammerhead-d5c727fff96ab8bc56255847ce20ed17a8980c9d.tar.gz | |
Merge "camera_device: remove type"
| -rw-r--r-- | sepolicy/camera.te | 4 | ||||
| -rw-r--r-- | sepolicy/file_contexts | 11 |
2 files changed, 7 insertions, 8 deletions
diff --git a/sepolicy/camera.te b/sepolicy/camera.te index 9948148..f5f513f 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 5ca2c6c..1a39fe7 100644 --- a/sepolicy/file_contexts +++ b/sepolicy/file_contexts @@ -70,13 +70,12 @@ /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/jpeg([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 +/dev/jpeg([0-9])+ u:object_r:video_device:s0 # Qualcomm MSM Audio devices /dev/msm_acdb u:object_r:audio_device:s0 |