camera_device: remove type
camera_device didn't really offer much in terms of control considering
that most domains that need camera_device, also need video_device and
vice versa.
Thus, drop camera_device from the policy.
Change-Id: I53eef3706921a39e5589df4d232c8511d34c664d
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 @@
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
