From 161bbcd1e621f2f9ef4a615d1f2286d42c7aafae Mon Sep 17 00:00:00 2001 From: Peter Lin Date: Thu, 25 Jan 2024 04:12:11 +0000 Subject: [PATCH 1/2] add dsim wakeup labels Bug: 320693841 Bug: 321733124 test: ls sys/devices/platform/19440000.drmdsim/19440000.drmdsim.0/wakeup -Z Change-Id: Ie99007455ef3879c8ee0aa1fa20801e4baf5e978 --- tracking_denials/bug_map | 1 - vendor/genfs_contexts | 2 ++ 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/tracking_denials/bug_map b/tracking_denials/bug_map index cfa4e3d9..a4cf1924 100644 --- a/tracking_denials/bug_map +++ b/tracking_denials/bug_map @@ -8,7 +8,6 @@ kernel dm_device blk_file b/319403445 mtectrl unlabeled dir b/264483752 pixelstats_vendor sysfs file b/299553682 system_server sysfs_batteryinfo file b/294967729 -system_suspend sysfs dir b/320693841 system_suspend sysfs_batteryinfo dir b/317316633 vendor_init default_prop file b/315104235 vendor_init default_prop file b/315104803 diff --git a/vendor/genfs_contexts b/vendor/genfs_contexts index caa6b824..52410b9e 100644 --- a/vendor/genfs_contexts +++ b/vendor/genfs_contexts @@ -260,6 +260,8 @@ genfscon sysfs /devices/platform/gpio_keys/wakeup/wakeup genfscon sysfs /devices/platform/sound-aoc/wakeup/wakeup u:object_r:sysfs_wakeup:s0 genfscon sysfs /devices/virtual/wakeup/wakeup u:object_r:sysfs_wakeup:s0 genfscon sysfs /devices/platform/odm/odm:btbcm/wakeup u:object_r:sysfs_wakeup:s0 +genfscon sysfs /devices/platform/19440000.drmdsim/19440000.drmdsim.0/wakeup/ u:object_r:sysfs_wakeup:s0 +genfscon sysfs /devices/platform/19450000.drmdsim/19450000.drmdsim.0/wakeup/ u:object_r:sysfs_wakeup:s0 # Trusty genfscon sysfs /module/trusty_virtio/parameters/use_high_wq u:object_r:sysfs_trusty:s0 From 97a16aff57df4bf32b8e05397018039486e499c1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thi=C3=A9baud=20Weksteen?= Date: Sun, 25 Feb 2024 23:58:44 +0000 Subject: [PATCH 2/2] Revert^2 "Remove persist.bootanim.color property definitions" 7b238e3659e11021e52d860025ada4806b439274 Change-Id: I56143303453cce01d812997ed4a06d815f2a6859 --- legacy/private/property_contexts | 5 ----- zuma-sepolicy.mk | 1 - 2 files changed, 6 deletions(-) delete mode 100644 legacy/private/property_contexts diff --git a/legacy/private/property_contexts b/legacy/private/property_contexts deleted file mode 100644 index abcdd419..00000000 --- a/legacy/private/property_contexts +++ /dev/null @@ -1,5 +0,0 @@ -# Boot animation dynamic colors -persist.bootanim.color1 u:object_r:bootanim_system_prop:s0 exact int -persist.bootanim.color2 u:object_r:bootanim_system_prop:s0 exact int -persist.bootanim.color3 u:object_r:bootanim_system_prop:s0 exact int -persist.bootanim.color4 u:object_r:bootanim_system_prop:s0 exact int diff --git a/zuma-sepolicy.mk b/zuma-sepolicy.mk index 2d80f554..abfaa288 100644 --- a/zuma-sepolicy.mk +++ b/zuma-sepolicy.mk @@ -18,7 +18,6 @@ BOARD_SEPOLICY_DIRS += hardware/google/pixel-sepolicy/powerstats # To be reviewed and removed. BOARD_SEPOLICY_DIRS += device/google/zuma-sepolicy/legacy/whitechapel_pro -PRODUCT_PRIVATE_SEPOLICY_DIRS += device/google/zuma-sepolicy/legacy/private SYSTEM_EXT_PUBLIC_SEPOLICY_DIRS += device/google/zuma-sepolicy/legacy/system_ext/public SYSTEM_EXT_PRIVATE_SEPOLICY_DIRS += device/google/zuma-sepolicy/legacy/system_ext/private