diff options
author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2021-06-24 01:01:26 +0000 |
---|---|---|
committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2021-06-24 01:01:26 +0000 |
commit | c9eaca4f147ff4aba30fd2ded2f694cd26b89204 (patch) | |
tree | 7622701a3935559d56862b7b92161eba26411317 | |
parent | f96bb61494d5fe2ea2f0cd908a4420704bfc5729 (diff) | |
parent | 2c0466ac93089c16279c465b812c0f9d46be7afa (diff) |
Snap for 7486544 from 2c0466ac93089c16279c465b812c0f9d46be7afa to sc-d1-releaseandroid-12.0.0_r7android-12.0.0_r6android-12.0.0_r5android-12.0.0_r4android-12.0.0_r15android-12.0.0_r14android-12.0.0_r13android-12.0.0_r12
Change-Id: I4da2105bb7fb14cacb69b50e15ca0db06fe9a748
-rw-r--r-- | device-common.mk | 4 | ||||
-rw-r--r-- | init.common.rc | 6 | ||||
-rw-r--r-- | sepolicy/file_contexts | 10 | ||||
-rw-r--r-- | sepolicy/genfs_contexts | 8 | ||||
-rw-r--r-- | sepolicy/suspend_blocker.te | 6 |
5 files changed, 32 insertions, 2 deletions
diff --git a/device-common.mk b/device-common.mk index 4beaf6e..18281e9 100644 --- a/device-common.mk +++ b/device-common.mk @@ -164,6 +164,10 @@ PRODUCT_PACKAGES += \ android.hardware.health@2.1-impl-cuttlefish \ android.hardware.health@2.1-service +# TODO: disable this service once we implement system suspend +PRODUCT_PACKAGES += \ + suspend_blocker + # mkbootimg host tool to build boot.img separately PRODUCT_HOST_PACKAGES := \ mkbootimg diff --git a/init.common.rc b/init.common.rc index 247a161..483b42f 100644 --- a/init.common.rc +++ b/init.common.rc @@ -61,3 +61,9 @@ service wpa_supplicant /vendor/bin/hw/wpa_supplicant \ class main disabled oneshot + +# TODO: disable this service once we implement system suspend +service suspend_blocker /vendor/bin/suspend_blocker + class early_hal # Start together with system_suspend HAL + group system + user root diff --git a/sepolicy/file_contexts b/sepolicy/file_contexts index e36d1b2..6f3906d 100644 --- a/sepolicy/file_contexts +++ b/sepolicy/file_contexts @@ -17,7 +17,14 @@ /sys/devices/platform/soc@0/4080000.remoteproc u:object_r:sysfs_remoteproc:s0 /sys/devices/platform/soc@0/ae00000.mdss u:object_r:sysfs_gpu:s0 -/sys/devices/platform/soc@0/c440000.spmi/spmi-0/0-00/c440000.spmi:pmic@0:rtc@6000/rtc u:object_r:sysfs_rtc:s0 + +/sys/devices/platform/soc@0/1c00000.pci/pci0000:00/0000:00:00.0/0000:01:00.0/wakeup/wakeup1 u:object_r:sysfs_wakeup:s0 +/sys/devices/platform/soc@0/a6f8800.usb/wakeup/wakeup2 u:object_r:sysfs_wakeup:s0 +/sys/devices/platform/soc@0/a8f8800.usb/wakeup/wakeup3 u:object_r:sysfs_wakeup:s0 +/sys/devices/platform/soc@0/c440000.spmi/spmi-0/0-00/c440000.spmi:pmic@0:pon@800/c440000.spmi:pmic@0:pon@800:pwrkey/wakeup/wakeup4 u:object_r:sysfs_wakeup:s0 +/sys/devices/platform/soc@0/c440000.spmi/spmi-0/0-00/c440000.spmi:pmic@0:pon@800/c440000.spmi:pmic@0:pon@800:resin/wakeup/wakeup5 u:object_r:sysfs_wakeup:s0 +/sys/devices/platform/soc@0/c440000.spmi/spmi-0/0-00/c440000.spmi:pmic@0:rtc@6000/wakeup/wakeup6 u:object_r:sysfs_wakeup:s0 +/sys/devices/platform/soc@0/c440000.spmi/spmi-0/0-00/c440000.spmi:pmic@0:rtc@6000/rtc/rtc0/alarmtimer.2.auto/wakeup/wakeup7 u:object_r:sysfs_wakeup:s0 /sys/class/remoteproc u:object_r:sysfs_remoteproc:s0 /sys/devices/platform/remoteproc-adsp/remoteproc u:object_r:sysfs_remoteproc:s0 @@ -36,6 +43,7 @@ /vendor/bin/qrtr-ns u:object_r:qrtr_exec:s0 /vendor/bin/rmtfs u:object_r:rmtfs_exec:s0 /vendor/bin/tqftpserv u:object_r:tqftpserv_exec:s0 +/vendor/bin/suspend_blocker u:object_r:suspend_blocker_exec:s0 /vendor/lib(64)?/dri/.* u:object_r:same_process_hal_file:s0 /vendor/lib(64)?/hw/gralloc\.gbm\.so u:object_r:same_process_hal_file:s0 diff --git a/sepolicy/genfs_contexts b/sepolicy/genfs_contexts index ee8b953..a0999b0 100644 --- a/sepolicy/genfs_contexts +++ b/sepolicy/genfs_contexts @@ -3,4 +3,10 @@ genfscon sysfs /devices/platform/remoteproc-adsp/remoteproc u:object_r:sys genfscon sysfs /devices/platform/remoteproc-cdsp/remoteproc u:object_r:sysfs_remoteproc:s0 genfscon sysfs /devices/platform/soc@0/4080000.remoteproc u:object_r:sysfs_remoteproc:s0 genfscon sysfs /devices/platform/soc@0/ae00000.mdss u:object_r:sysfs_gpu:s0 -genfscon sysfs /devices/platform/soc@0/c440000.spmi/spmi-0/0-00/c440000.spmi:pmic@0:rtc@6000 u:object_r:sysfs_rtc:s0 +genfscon sysfs /devices/platform/soc@0/1c00000.pci/pci0000:00/0000:00:00.0/0000:01:00.0/wakeup/wakeup1 u:object_r:sysfs_wakeup:s0 +genfscon sysfs /devices/platform/soc@0/a6f8800.usb/wakeup/wakeup2 u:object_r:sysfs_wakeup:s0 +genfscon sysfs /devices/platform/soc@0/a8f8800.usb/wakeup/wakeup3 u:object_r:sysfs_wakeup:s0 +genfscon sysfs /devices/platform/soc@0/c440000.spmi/spmi-0/0-00/c440000.spmi:pmic@0:pon@800/c440000.spmi:pmic@0:pon@800:pwrkey/wakeup/wakeup4 u:object_r:sysfs_wakeup:s0 +genfscon sysfs /devices/platform/soc@0/c440000.spmi/spmi-0/0-00/c440000.spmi:pmic@0:pon@800/c440000.spmi:pmic@0:pon@800:resin/wakeup/wakeup5 u:object_r:sysfs_wakeup:s0 +genfscon sysfs /devices/platform/soc@0/c440000.spmi/spmi-0/0-00/c440000.spmi:pmic@0:rtc@6000/wakeup/wakeup6 u:object_r:sysfs_wakeup:s0 +genfscon sysfs /devices/platform/soc@0/c440000.spmi/spmi-0/0-00/c440000.spmi:pmic@0:rtc@6000/rtc/rtc0/alarmtimer.2.auto/wakeup/wakeup7 u:object_r:sysfs_wakeup:s0 diff --git a/sepolicy/suspend_blocker.te b/sepolicy/suspend_blocker.te new file mode 100644 index 0000000..fa6e02a --- /dev/null +++ b/sepolicy/suspend_blocker.te @@ -0,0 +1,6 @@ +type suspend_blocker, domain; +type suspend_blocker_exec, exec_type, vendor_file_type, file_type; + +init_daemon_domain(suspend_blocker); + +wakelock_use(suspend_blocker); |