From 84ed735c2b81888766527a191669c063dd52298a Mon Sep 17 00:00:00 2001 From: Vachounet Date: Sat, 23 Sep 2017 07:46:02 +0200 Subject: [PATCH] sanders: update ramdisk --- device.mk | 1 - rootdir/Android.mk | 8 ---- rootdir/etc/init.mmi.rc | 83 +++++++++++----------------------------- rootdir/etc/init.qcom.rc | 16 ++++---- sepolicy/device.te | 1 - sepolicy/file.te | 1 - sepolicy/file_contexts | 5 --- sepolicy/mm-qcamerad.te | 1 - sepolicy/mmi_laser.te | 15 -------- 9 files changed, 31 insertions(+), 100 deletions(-) delete mode 100644 sepolicy/mmi_laser.te diff --git a/device.mk b/device.mk index f2ea89a..02d5cd1 100644 --- a/device.mk +++ b/device.mk @@ -297,7 +297,6 @@ PRODUCT_PACKAGES += \ PRODUCT_PACKAGES += \ fstab.qcom \ init.mmi.boot.sh \ - init.mmi.laser.sh \ init.mmi.rc \ init.mmi.usb.rc \ init.oem.hw.sh \ diff --git a/rootdir/Android.mk b/rootdir/Android.mk index a874f49..cc2c185 100644 --- a/rootdir/Android.mk +++ b/rootdir/Android.mk @@ -10,14 +10,6 @@ LOCAL_SRC_FILES := etc/init.mmi.boot.sh LOCAL_MODULE_PATH := $(TARGET_OUT_EXECUTABLES) include $(BUILD_PREBUILT) -include $(CLEAR_VARS) -LOCAL_MODULE := init.mmi.laser.sh -LOCAL_MODULE_TAGS := optional eng -LOCAL_MODULE_CLASS := ETC -LOCAL_SRC_FILES := etc/init.mmi.laser.sh -LOCAL_MODULE_PATH := $(TARGET_OUT_EXECUTABLES) -include $(BUILD_PREBUILT) - include $(CLEAR_VARS) LOCAL_MODULE := init.mmi.touch.sh LOCAL_MODULE_TAGS := optional eng diff --git a/rootdir/etc/init.mmi.rc b/rootdir/etc/init.mmi.rc index 3982d41..479ddd0 100644 --- a/rootdir/etc/init.mmi.rc +++ b/rootdir/etc/init.mmi.rc @@ -34,6 +34,7 @@ on post-fs mkdir /persist/public 0755 mot_tcmd mot_tcmd mkdir /persist/public/atvc 0770 mot_atvc shell mkdir /persist/public/battd 0755 mot_accy mot_tcmd + mkdir /persist/public/att_dm 0775 radio mot_tcmd mkdir /persist/public/hiddenmenu 0755 radio radio mkdir /persist/public/hiddenmenu/data 0775 system mot_tcmd mkdir /persist/public/locale 0700 system system @@ -42,6 +43,8 @@ on post-fs mkdir /persist/wifi 0755 mot_tcmd mot_tcmd mkdir /persist/bt 0755 mot_tcmd bluetooth mkdir /persist/wmdrm 0775 mot_drm mot_drm + mkdir /persist/public/usc_dm 0775 radio radio + mkdir /persist/sds 0700 vold vold chown mot_tcmd mot_tcmd /persist/factory/fti chmod 0660 /persist/factory/fti @@ -51,13 +54,16 @@ on post-fs chown mot_tcmd mot_tcmd /persist/bt/bt_bdaddr chmod 0664 /persist/bt/bt_bdaddr + # Set life_calls and life_timer file permissions + chown radio mot_tcmd /persist/public/hiddenmenu/life_calls + chmod 0775 /persist/public/hiddenmenu/life_calls + chown radio mot_tcmd /persist/public/hiddenmenu/life_timer + chmod 0775 /persist/public/hiddenmenu/life_timer + swapon_all fstab.qcom write /proc/sys/vm/page-cluster 0 on post-fs-data - # AK09912 calibration file directory - mkdir /data/misc/akmd 0770 system compass - #setup folder for WLAN WAPI chmod 0770 /data/wapi_certificate @@ -159,28 +165,18 @@ on boot # restore default_message_loglevel to KERN_WARNING write /proc/sys/kernel/printk "7 4 1 7" - # STML0 driver parameter permissions - chown root mot_tcmd /sys/module/stml0xx/parameters/irq_disable - chmod 0660 /sys/module/stml0xx/parameters/irq_disable - chown root mot_tcmd /sys/module/phy_msm_usb/parameters/host_mode_disable chmod 0660 /sys/module/phy_msm_usb/parameters/host_mode_disable chown root mot_tcmd /sys/devices/soc/7000000.ssusb/disable_id_pin chmod 0220 /sys/devices/soc/7000000.ssusb/disable_id_pin - # change permission for capsensor - chmod 0660 /sys/class/capsense/enable - chown system system sys/class/capsense/enable - - #STML0 device permissions - chown system compass /dev/stml0xx - chmod 0660 /dev/stml0xx - chown compass compass /dev/stml0xx_as - chmod 0660 /dev/stml0xx_as - chown compass compass /dev/stml0xx_ms - chmod 0660 /dev/stml0xx_ms - chown compass compass /dev/stml0xx_akm - chmod 0660 /dev/stml0xx_akm + #change ownership and permission for LTR559 + chown system system /sys/class/sensors/Rear\ Proximity\ sensor/enable + chown system system /sys/class/sensors/Rear\ Proximity\ sensor/poll_delay + chown system system /sys/class/sensors/Rear\ Proximity\ sensor/enable_wakeup + chmod 0660 /sys/class/sensors/Rear\ Proximity\ sensor/enable + chmod 0660 /sys/class/sensors/Rear\ Proximity\ sensor/poll_delay + chmod 0660 /sys/class/sensors/Rear\ Proximity\ sensor/enable_wakeup # Change permission for type C params chown root mot_tcmd /sys/devices/soc/78b6000.i2c/i2c-2/2-0022/CC_state @@ -219,39 +215,9 @@ on boot chown system system /sys/class/timed_output/vibrator/enable chmod 0660 /sys/class/timed_output/vibrator/enable - # Change ownership and permission for laser_sensor - chown system system /sys/kernel/range/enable_sar - chmod 0660 /sys/kernel/range/enable_sar - chown system system /sys/kernel/range/set_delay_ms - chmod 0660 /sys/kernel/range/set_delay_ms - chown system system /sys/kernel/range/near - chmod 0660 /sys/kernel/range/near - -# Change ownership and permission for rear_sensor - chown system system /sys/class/i2c-dev/i2c-2/device/2-0049/enable_sar - chmod 0660 /sys/class/i2c-dev/i2c-2/device/2-0049/enable_sar - chown system system /sys/class/i2c-dev/i2c-2/device/2-0049/set_delay_ms - chmod 0660 /sys/class/i2c-dev/i2c-2/device/2-0049/set_delay_ms - chown system system /sys/class/i2c-dev/i2c-6/device/6-0049/enable_sar - chmod 0660 /sys/class/i2c-dev/i2c-6/device/6-0049/enable_sar - chown system system /sys/class/i2c-dev/i2c-6/device/6-0049/set_delay_ms - chmod 0660 /sys/class/i2c-dev/i2c-6/device/6-0049/set_delay_ms - -# Change the ownership of display TE files for tcmds chown root mot_tcmd /sys/class/graphics/fb0/te_enable chown root mot_tcmd /sys/class/graphics/fb0/frame_counter - -# FPC device parameter permissions - chown system mot_tcmd /sys/bus/spi/devices/spi12.0/nav - chown system mot_tcmd /sys/bus/spi/devices/spi12.0/clk_enable - chown system mot_tcmd /sys/bus/spi/devices/spi12.0/dev_enable - chown system mot_tcmd /sys/bus/spi/devices/spi12.0/irq - chown system mot_tcmd /sys/bus/spi/devices/spi12.0/irq_cnt - chmod 0440 /sys/bus/spi/devices/spi12.0/irq_cnt - -# Change ownership of aov related sysfs entries - wait /sys/kernel/aov/event chown audio audio /sys/kernel/aov/trigger chown audio audio /sys/kernel/aov/register chown audio audio /sys/kernel/aov/event @@ -314,11 +280,6 @@ service mmi-boot-sh /system/bin/init.mmi.boot.sh user root oneshot -service mmi-laser-sh /system/bin/init.mmi.laser.sh - class core - user root - oneshot - service mmi-touch-sh /system/bin/init.mmi.touch.sh class core user root @@ -329,12 +290,11 @@ service oem-hw-sh /system/bin/init.oem.hw.sh user root oneshot -# Start Sensor daemon -service motosh /system/bin/motosh boot - class main - user compass - group compass misc input - oneshot +# Sanders uses qcom sensor service +service sensors /system/bin/sensors.qcom + class core + user root + group root service thermal-com /system/vendor/bin/thermal-engine --minimode class main @@ -348,6 +308,7 @@ on property:sys.wifi.tethering=true write /sys/class/net/wlan0/queues/rx-1/rps_cpus ${sys.usb.rps_mask} write /sys/class/net/wlan0/queues/rx-2/rps_cpus ${sys.usb.rps_mask} write /sys/class/net/wlan0/queues/rx-3/rps_cpus ${sys.usb.rps_mask} + write /sys/class/net/wlan0/queues/rx-4/rps_cpus ${sys.usb.rps_mask} on property:sys.wifi.tethering=false write /sys/class/net/rmnet_data0/queues/rx-0/rps_cpus ${sys.rmnet_vnd.rps_mask} diff --git a/rootdir/etc/init.qcom.rc b/rootdir/etc/init.qcom.rc index 5f0b5f2..71e8aee 100644 --- a/rootdir/etc/init.qcom.rc +++ b/rootdir/etc/init.qcom.rc @@ -118,6 +118,10 @@ on boot chown radio radio /data/misc/radio/copy_complete chmod 0660 /data/misc/radio/copy_complete + # copy prebuilt qcril.db files always + copy /system/vendor/qcril.db /data/misc/radio/qcril_prebuilt.db + chown radio radio /data/misc/radio/qcril_prebuilt.db + chmod 0660 /data/misc/radio/qcril_prebuilt.db # File flags for prebuilt ril db file write /data/misc/radio/prebuilt_db_support 1 chown radio radio /data/misc/radio/prebuilt_db_support @@ -487,13 +491,6 @@ service adsprpcd /system/bin/adsprpcd user media group media -# Start AKM executable -service ecompassd /system/bin/akmd09912 - class main - user compass - group compass misc input - disabled - service irsc_util /system/bin/irsc_util "/etc/sec_config" class core user root @@ -913,7 +910,12 @@ on property:sys.boot_completed=1 write /sys/block/mmcblk0/queue/read_ahead_kb 128 write /sys/block/dm-0/queue/read_ahead_kb 128 write /sys/block/dm-1/queue/read_ahead_kb 128 + #WDSP FW boot sysfs node used by STHAL chown media audio /sys/kernel/wdsp0/boot + + #CPE fw_name used by sound trigger HAL + chown media audio /sys/kernel/wcd_cpe0/fw_name + rm /data/system/perfd/default_values start perfd diff --git a/sepolicy/device.te b/sepolicy/device.te index a76e04e..8744bee 100644 --- a/sepolicy/device.te +++ b/sepolicy/device.te @@ -5,7 +5,6 @@ type haptics_device, dev_type; type hob_device, dev_type; type hw_block_device, dev_type; type graphics_fb_device, dev_type; -type laser_device, dev_type; type synaptics_rmi_device, dev_type; type shwi_device, dev_type; type isdbt_device, dev_type; diff --git a/sepolicy/file.te b/sepolicy/file.te index 0325e5d..6ea44c0 100644 --- a/sepolicy/file.te +++ b/sepolicy/file.te @@ -33,7 +33,6 @@ type netmgr_data_file, file_type, data_file_type; type sysfs_adsp, fs_type, sysfs_type; type sysfs_homebutton, fs_type, sysfs_type, mlstrustedobject; type sysfs_mmi_fp, fs_type, sysfs_type; -type sysfs_mmi_laser, fs_type, sysfs_type; type sysfs_mmi_touch, fs_type, sysfs_type; type sysfs_capsense, fs_type, sysfs_type; diff --git a/sepolicy/file_contexts b/sepolicy/file_contexts index 4de71f0..441ef6e 100644 --- a/sepolicy/file_contexts +++ b/sepolicy/file_contexts @@ -9,16 +9,12 @@ /system/bin/adspd u:object_r:adspd_exec:s0 /system/bin/hci_qcomm_init u:object_r:config_bluetooth_exec:s0 /system/bin/init\.mmi\.boot\.sh u:object_r:mmi_boot_exec:s0 -/system/bin/init\.mmi\.laser\.sh u:object_r:mmi_laser_exec:s0 /system/bin/init\.mmi\.touch\.sh u:object_r:mmi_touch_sh_exec:s0 /system/bin/init\.oem\.hw\.sh u:object_r:oem-hw-sh_exec:s0 /system/bin/wlan_carrier_bin\.sh u:object_r:init_wifi_exec:s0 /system/bin/motosh u:object_r:sensor_hub_exec:s0 /system/bin/akmd09912 u:object_r:akmd_exec:s0 -# Camera -/sys/kernel/range(/.*)? u:object_r:sysfs_mmi_laser:s0 - # CMActions /sys/homebutton(/.*)? u:object_r:sysfs_homebutton:s0 @@ -101,7 +97,6 @@ /data/misc/netmgr(/.*)? u:object_r:netmgr_data_file:s0 # Sensors -/dev/laser u:object_r:laser_device:s0 /dev/mmi_sys_temp u:object_r:thermal_device:s0 /dev/motosh u:object_r:sensors_device:s0 /dev/motosh_as u:object_r:sensors_device:s0 diff --git a/sepolicy/mm-qcamerad.te b/sepolicy/mm-qcamerad.te index 399f531..be8faed 100644 --- a/sepolicy/mm-qcamerad.te +++ b/sepolicy/mm-qcamerad.te @@ -1,5 +1,4 @@ allow mm-qcamerad debug_prop:property_service set; -allow mm-qcamerad laser_device:chr_file { read write ioctl open }; allow mm-qcamerad persist_file:dir search; allow mm-qcamerad persist_file:file { read getattr open }; allow mm-qcamerad system_data_file:dir read; diff --git a/sepolicy/mmi_laser.te b/sepolicy/mmi_laser.te deleted file mode 100644 index efabb70..0000000 --- a/sepolicy/mmi_laser.te +++ /dev/null @@ -1,15 +0,0 @@ -type mmi_laser, domain, domain_deprecated; -type mmi_laser_exec, exec_type, file_type; -init_daemon_domain(mmi_laser) - -# shell scripts need to execute /system/bin/sh -allow mmi_laser shell_exec:file rx_file_perms; -allow mmi_laser toolbox_exec:file rx_file_perms; - -# Logs to /dev/kmsg -allow mmi_laser kmsg_device:chr_file w_file_perms; - -allow mmi_laser persist_file:dir search; -allow mmi_laser persist_file:file r_file_perms; -allow mmi_laser self:capability dac_override; -allow mmi_laser sysfs_mmi_laser:file rw_file_perms;