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: Iaeb8e8701e51039955e3178c2def5242865b98c8
diff --git a/sepolicy/camera.te b/sepolicy/camera.te
index 8f4be19..a59417e 100644
--- a/sepolicy/camera.te
+++ b/sepolicy/camera.te
@@ -10,7 +10,7 @@
allow camera system_server:unix_stream_socket { read write };
# Interact with other media devices
-allow camera { gpu_device video_device camera_device }:chr_file rw_file_perms;
+allow camera { gpu_device video_device }:chr_file rw_file_perms;
allow camera { mediaserver surfaceflinger }:fd use;
# Create camera socket
diff --git a/sepolicy/file_contexts b/sepolicy/file_contexts
index 181f694..1b40bec 100644
--- a/sepolicy/file_contexts
+++ b/sepolicy/file_contexts
@@ -73,7 +73,7 @@
/dev/msm_audio_cal u:object_r:audio_device:s0
/dev/msm_rtac u:object_r:audio_device:s0
/dev/v4l-subdev[0-9]* u:object_r:video_device:s0
-/dev/media([0-9])+ u:object_r:camera_device:s0
+/dev/media([0-9])+ u:object_r:video_device:s0
/dev/ttyHS0 u:object_r:ttyHS0_device:s0
/dev/subsys_modem u:object_r:subsys_modem_device:s0
@@ -84,8 +84,8 @@
/dev/fpc1020 u:object_r:fingerprint_device:s0
# MSM camera related
-/dev/media[0-9]+ u:object_r:camera_device:s0
-/dev/jpeg[0-9]+ u:object_r:camera_device:s0
+/dev/media[0-9]+ u:object_r:video_device:s0
+/dev/jpeg[0-9]+ u:object_r:video_device:s0
# System files
/system/bin/perfd u:object_r:perfd_exec:s0
