Merge "resurrect camera_device"

am: 163c6080 Change-Id: Ia7e00dda7fea4e58c450c50ab7fd5fc709ebaa3e

Merge "resurrect camera_device"
8585e8db · Jeffrey Vander Stoep · android-build-merger · a31bd6bd · 163c6080 · 8585e8db
Commit 8585e8db authored 8 years ago by Jeffrey Vander Stoep Committed by android-build-merger 8 years ago
--- a/cameraserver.te
+++ b/cameraserver.te
@@ -15,6 +15,7 @@ allow cameraserver camera_data_file:file create_file_perms;

 allow cameraserver video_device:dir r_dir_perms;
 allow cameraserver video_device:chr_file rw_file_perms;
+allow cameraserver camera_device:chr_file rw_file_perms;
 allow cameraserver ion_device:chr_file rw_file_perms;

 allow cameraserver appops_service:service_manager find;

--- a/file_contexts
+++ b/file_contexts
@@ -61,7 +61,7 @@
 /dev/block/ram[0-9]*	u:object_r:ram_device:s0
 /dev/block/zram[0-9]*	u:object_r:ram_device:s0
 /dev/bus/usb(.*)?       u:object_r:usb_device:s0
-/dev/cam		u:object_r:video_device:s0
+/dev/cam		u:object_r:camera_device:s0
 /dev/console		u:object_r:console_device:s0
 /dev/cpuctl(/.*)?	u:object_r:cpuctl_device:s0
 /dev/device-mapper	u:object_r:dm_device:s0