From 355d7a25539740a74493f742da5d6be943a3bb8c Mon Sep 17 00:00:00 2001 From: nailyk-fr Date: Sun, 22 Oct 2017 19:38:00 +0200 Subject: shinano-common: init: Rework users for mediaserver Change-Id: Ie2ed042cfc5e97a71e0485fc048580b9f04cf694 --- rootdir/init.camera.rc | 21 +++++++++++---------- rootdir/init.qcom.rc | 2 +- rootdir/ueventd.qcom.rc | 24 +++++++++++++----------- 3 files changed, 25 insertions(+), 22 deletions(-) diff --git a/rootdir/init.camera.rc b/rootdir/init.camera.rc index b2bd7a7..f1b9f7d 100644 --- a/rootdir/init.camera.rc +++ b/rootdir/init.camera.rc @@ -54,7 +54,7 @@ on boot on post-fs-data # we will remap this as /mnt/sdcard with the sdcard fuse tool - mkdir /data/misc/camera 0770 camera camera + mkdir /data/misc/camera 0770 media camera mkdir /data/misc/cameraserver 0700 cameraserver cameraserver # create directory for scd @@ -72,9 +72,9 @@ on post-fs-data # SONY: Camera mkdir /data/camera 0770 media camera chown media camera /sys/devices/sony_camera_0/info - chmod 0770 /sys/devices/sony_camera_0/info + + chmod 0660 /sys/devices/sony_camera_0/info chown media camera /sys/devices/sony_camera_1/info - chmod 0770 /sys/devices/sony_camera_1/info # SONY: Import MiscTA to System properties exec -- /system/bin/taimport property @@ -107,8 +107,9 @@ start credmgrd # Start Credential manager daemon service credmgrd /system/bin/credmgrd user system - group oem_5996 - socket credmgr stream 0660 system oem_5996 + group system camera media +# TODO: 666 is not good for credmgrd socket + socket credmgr stream 0666 system camera disabled # Secure Config Transfer service @@ -144,8 +145,7 @@ on property:sys.listeners.registered=true service qcamerasvr /system/bin/mm-qcamera-daemon class late_start user camera -# group camera system inet input graphics - group camera system inet input graphics oem_5996 cameraserver + group camera media system inet input graphics # seclabel u:r:mm-qcamerad:s0 # SONY: TrimArea Daemon @@ -153,9 +153,10 @@ service qcamerasvr /system/bin/mm-qcamera-daemon service tad_static /sbin/tad_static /dev/block/bootdevice/by-name/TA 0,16 #service tad_static /sbin/tad_static /data/credmgr/ta_part.bin 0,16 class trimarea - user oem_5997 - group oem_5997 oem_5993 root - socket tad stream 0770 system oem_5993 + user system + group system root camera media + socket tad stream 0770 system system + # tad_static is in rootfs, normal file_context does not work seclabel u:r:tad:s0 service updatemiscta /system/bin/updatemiscta diff --git a/rootdir/init.qcom.rc b/rootdir/init.qcom.rc index 09f004e..4c8dcc8 100644 --- a/rootdir/init.qcom.rc +++ b/rootdir/init.qcom.rc @@ -461,7 +461,7 @@ service loc_launcher /system/bin/loc_launcher # Start suntrold service suntrold /system/bin/suntrold user system - group system + group system camera oneshot class main diff --git a/rootdir/ueventd.qcom.rc b/rootdir/ueventd.qcom.rc index 83caa7a..97fff60 100644 --- a/rootdir/ueventd.qcom.rc +++ b/rootdir/ueventd.qcom.rc @@ -110,19 +110,21 @@ /dev/hsicctl14 0640 radio radio /dev/hsicctl15 0640 radio radio /dev/hsicctl16 0640 radio radio -/dev/video* 0660 system camera -/dev/media* 0660 system camera -/dev/v4l-subdev* 0660 system camera + +/dev/video* 0660 media camera +/dev/media* 0660 media camera +/dev/v4l-subdev* 0660 media camera /dev/qseecom 0660 system drmrpc -/dev/gemini0 0660 system camera -/dev/jpeg0 0660 system camera -/dev/jpeg1 0660 system camera -/dev/jpeg2 0660 system camera +/dev/gemini0 0660 media camera +/dev/jpeg0 0660 media camera +/dev/jpeg1 0660 media camera +/dev/jpeg2 0660 media camera /dev/adsprpc-smd 0664 system system -/dev/msm_camera/* 0660 system camera -/dev/gemini0 0660 system camera -/dev/gemini/ 0660 system camera -/dev/mercury0 0660 system camera +/dev/msm_camera/* 0660 media camera +/dev/gemini0 0660 media camera +/dev/gemini/ 0660 media camera +/dev/mercury0 0660 media camera + /dev/msm_vidc_reg 0660 system audio /dev/msm_vidc_dec 0660 system audio /dev/msm_vidc_dec_sec 0660 system audio -- cgit v1.2.3