From 1461f0e029b83ba8f7ed3c6c6526a3ae7ddb9b44 Mon Sep 17 00:00:00 2001 From: Chia-Kai Liang Date: Mon, 8 May 2017 13:35:33 -0700 Subject: [PATCH] Create debug folder for camera. Bug: 38048356 Test: Build/run locally. Change-Id: Ic89464492e54f91925fabebeaf3458c259e9d957 --- init.hardware.rc | 6 +++--- sepolicy/file.te | 1 + sepolicy/file_contexts | 1 + sepolicy/hal_camera_default.te | 6 ++++++ 4 files changed, 11 insertions(+), 3 deletions(-) diff --git a/init.hardware.rc b/init.hardware.rc index b276175d..6dd57f22 100644 --- a/init.hardware.rc +++ b/init.hardware.rc @@ -206,6 +206,9 @@ on post-fs-data # Set indication (checked by vold) that we have finished this action setprop vold.post_fs_data_done 1 + # b/38048356 Setup debug folders for camera + mkdir /data/vendor/camera 0770 camera camera + # zygote need to be started after otapreopt which will be done on post-fs-data on zygote-start # zygote is started in common init.rc @@ -222,9 +225,6 @@ on zygote-start # Create directory for TZ Apps mkdir /data/misc/qsee 0770 system system - #Create folder for mm-qcamera-daemon - mkdir /data/misc/camera 0770 camera camera - mkdir /data/media 0770 media_rw media_rw chown media_rw media_rw /data/media diff --git a/sepolicy/file.te b/sepolicy/file.te index 0150587d..fc9a841d 100644 --- a/sepolicy/file.te +++ b/sepolicy/file.te @@ -39,6 +39,7 @@ type persist_sensors_file, file_type; type netmgr_data_file, file_type, data_file_type; +type camera_vendor_data_file, file_type, data_file_type; type nfc_vendor_data_file, file_type, data_file_type; type radio_vendor_data_file, file_type, data_file_type, mlstrustedobject; type cnss_vendor_data_file, file_type, data_file_type, mlstrustedobject; diff --git a/sepolicy/file_contexts b/sepolicy/file_contexts index 1b502a8c..1862c315 100644 --- a/sepolicy/file_contexts +++ b/sepolicy/file_contexts @@ -267,6 +267,7 @@ /data/misc/location(/.*)? u:object_r:location_data_file:s0 /data/ramdump(/.*)? u:object_r:ramdump_data_file:s0 /data/nfc(/.*)? u:object_r:nfc_data_file:s0 +/data/vendor/camera(/.*)? u:object_r:camera_vendor_data_file:s0 /data/vendor/nfc(/.*)? u:object_r:nfc_vendor_data_file:s0 /data/vendor/radio(/.*)? u:object_r:radio_vendor_data_file:s0 /data/vendor/wifi(/.*)? u:object_r:cnss_vendor_data_file:s0 diff --git a/sepolicy/hal_camera_default.te b/sepolicy/hal_camera_default.te index 9aa8df64..df5516bb 100644 --- a/sepolicy/hal_camera_default.te +++ b/sepolicy/hal_camera_default.te @@ -6,3 +6,9 @@ allow hal_camera_default qdisplay_service:service_manager { find }; binder_call(hal_camera_default, hal_graphics_composer) binder_call(hal_camera_default, system_server) + +# For camera team debugging +userdebug_or_eng(` + allow hal_camera_default camera_vendor_data_file:dir create_dir_perms; + allow hal_camera_default camera_vendor_data_file:file create_file_perms; +')