Merge changes Id97d7cdf,I8743a2bb into oc-dr1-dev

* changes:
  Allow init.power.sh to change printk console_suspend
  Remove no_console_suspend=1 from kernel command line
This commit is contained in:
Siqi Lin
2017-07-20 22:37:00 +00:00
committed by Android (Google) Code Review
4 changed files with 3 additions and 1 deletions

View File

@@ -33,7 +33,6 @@ BOARD_KERNEL_CMDLINE += user_debug=31 msm_rtb.filter=0x37 ehci-hcd.park=3
BOARD_KERNEL_CMDLINE += service_locator.enable=1
BOARD_KERNEL_CMDLINE += swiotlb=2048
BOARD_KERNEL_CMDLINE += firmware_class.path=/vendor/firmware
BOARD_KERNEL_CMDLINE += no_console_suspend=1
BOARD_KERNEL_CMDLINE += loop.max_part=7
BOARD_KERNEL_BASE := 0x00000000

View File

@@ -1,4 +1,5 @@
type sysfs_camera, sysfs_type, fs_type;
type sysfs_console_suspend, sysfs_type, fs_type;
type sysfs_easel, sysfs_type, fs_type;
type sysfs_fingerprint, sysfs_type, fs_type;
type sysfs_graphics, sysfs_type, fs_type;

View File

@@ -40,6 +40,7 @@ genfscon sysfs /devices/soc/soc:fp_fpc1020 u:object
genfscon sysfs /devices/virtual/thermal u:object_r:sysfs_thermal:s0
genfscon sysfs /devices/virtual/wahoo_laser u:object_r:sysfs_laser:s0
genfscon sysfs /module/msm_thermal u:object_r:sysfs_thermal:s0
genfscon sysfs /module/printk/parameters/console_suspend u:object_r:sysfs_console_suspend:s0
genfscon sysfs /module/tcp_cubic/parameters u:object_r:sysfs_net:s0
genfscon sysfs /module/diagchar/parameters/timestamp_switch u:object_r:sysfs_timestamp_switch:s0
genfscon sysfs /devices/virtual/graphics/fb0 u:object_r:sysfs_graphics:s0

View File

@@ -16,3 +16,4 @@ allow init_power sysfs_thermal:file w_file_perms;
allow init_power sysfs_devices_system_cpu:file w_file_perms;
allow init_power sysfs_soc:file r_file_perms;
allow init_power sysfs_soc:dir search;
allow init_power sysfs_console_suspend:file w_file_perms;