From dd5d44c6f6570e9b21709444751e795662f1dcb0 Mon Sep 17 00:00:00 2001 From: Kiwon Park Date: Thu, 6 Jun 2024 17:36:40 +0000 Subject: [PATCH 1/5] Revert "Allow vendor_init to set setupwizard prop" This reverts commit 432fb7298d14b59411e261b21fd5261023f0da21. Reason for revert: consolidating it in zumapro sepolicy: ag/27701196 Bug: 336903409 Change-Id: I0ee3ff036b5d51b532c59e427ca2b3942b5377ee Merged-In: I0ee3ff036b5d51b532c59e427ca2b3942b5377ee --- comet-sepolicy.mk | 4 ---- system_ext/private/gmscore_app.te | 2 -- system_ext/private/priv_app.te | 2 -- system_ext/private/property_contexts | 2 -- system_ext/public/property.te | 2 -- vendor/vendor_init.te | 3 --- 6 files changed, 15 deletions(-) delete mode 100644 system_ext/private/gmscore_app.te delete mode 100644 system_ext/private/priv_app.te delete mode 100644 system_ext/private/property_contexts delete mode 100644 system_ext/public/property.te diff --git a/comet-sepolicy.mk b/comet-sepolicy.mk index 3ffaa05..32aa697 100644 --- a/comet-sepolicy.mk +++ b/comet-sepolicy.mk @@ -1,6 +1,2 @@ # sepolicy exclusively for comet. BOARD_SEPOLICY_DIRS += device/google/comet-sepolicy/vendor - -# system_ext -SYSTEM_EXT_PUBLIC_SEPOLICY_DIRS += device/google/comet-sepolicy/system_ext/public -SYSTEM_EXT_PRIVATE_SEPOLICY_DIRS += device/google/comet-sepolicy/system_ext/private diff --git a/system_ext/private/gmscore_app.te b/system_ext/private/gmscore_app.te deleted file mode 100644 index 4dc1639..0000000 --- a/system_ext/private/gmscore_app.te +++ /dev/null @@ -1,2 +0,0 @@ -# Allow to read setupwizard_feature_prop -get_prop(gmscore_app, setupwizard_feature_prop) diff --git a/system_ext/private/priv_app.te b/system_ext/private/priv_app.te deleted file mode 100644 index 90bc371..0000000 --- a/system_ext/private/priv_app.te +++ /dev/null @@ -1,2 +0,0 @@ -# Allow to read setupwizard_feature_prop -get_prop(priv_app, setupwizard_feature_prop) diff --git a/system_ext/private/property_contexts b/system_ext/private/property_contexts deleted file mode 100644 index 464a289..0000000 --- a/system_ext/private/property_contexts +++ /dev/null @@ -1,2 +0,0 @@ -# setupwizard -setupwizard.feature.provisioning_profile_mode u:object_r:setupwizard_feature_prop:s0 diff --git a/system_ext/public/property.te b/system_ext/public/property.te deleted file mode 100644 index 96cb3b3..0000000 --- a/system_ext/public/property.te +++ /dev/null @@ -1,2 +0,0 @@ -# setupwizard -system_public_prop(setupwizard_feature_prop) diff --git a/vendor/vendor_init.te b/vendor/vendor_init.te index 0af5c8a..91d16a9 100644 --- a/vendor/vendor_init.te +++ b/vendor/vendor_init.te @@ -1,5 +1,2 @@ # Camera vendor property set_prop(vendor_init, vendor_camera_debug_prop) - -# setupwizard -set_prop(vendor_init, setupwizard_feature_prop) From 4dffc584be8b0ad3d187a590caf477fbcfa7507b Mon Sep 17 00:00:00 2001 From: Zheng Pan Date: Wed, 12 Jun 2024 12:21:16 -0700 Subject: [PATCH 2/5] Add DP wakeup file permission Bug: 346660264 Test: None Change-Id: I8f85b79aedc640d22982855a099b2448f93b29a3 Merged-In: I8f85b79aedc640d22982855a099b2448f93b29a3 --- vendor/genfs_contexts | 1 + 1 file changed, 1 insertion(+) diff --git a/vendor/genfs_contexts b/vendor/genfs_contexts index fd9ff7a..15960d0 100644 --- a/vendor/genfs_contexts +++ b/vendor/genfs_contexts @@ -37,6 +37,7 @@ genfscon sysfs /devices/platform/10ca0000.hsi2c/i2c-10/10-0061/power/wakeup genfscon sysfs /devices/platform/10ca0000.hsi2c/i2c-10/10-0061/power_supply/wireless/power/wakeup u:object_r:sysfs_wakeup:s0 genfscon sysfs /devices/platform/10ca0000.hsi2c/i2c-10/10-0061/power_supply/wireless/wakeup u:object_r:sysfs_wakeup:s0 genfscon sysfs /devices/platform/10ca0000.hsi2c/i2c-10/10-0061/wakeup u:object_r:sysfs_wakeup:s0 +genfscon sysfs /devices/platform/110f0000.drmdp/wakeup u:object_r:sysfs_wakeup:s0 genfscon sysfs /devices/platform/111c0000.spi/spi_master/spi19/spi19.0/synaptics_tcm.0/power/wakeup u:object_r:sysfs_wakeup:s0 genfscon sysfs /devices/platform/111c0000.spi/spi_master/spi19/spi19.0/synaptics_tcm.0/wakeup u:object_r:sysfs_wakeup:s0 genfscon sysfs /devices/platform/google,dual_batt_gauge/power_supply/dualbatt/power/wakeup u:object_r:sysfs_wakeup:s0 From 423a870ad43ef049945c63c9f8157b46af12210d Mon Sep 17 00:00:00 2001 From: Zheng Pan Date: Wed, 12 Jun 2024 12:21:16 -0700 Subject: [PATCH 3/5] Add DP wakeup file permission Bug: 346660264 Test: None Change-Id: I8f85b79aedc640d22982855a099b2448f93b29a3 --- vendor/genfs_contexts | 1 + 1 file changed, 1 insertion(+) diff --git a/vendor/genfs_contexts b/vendor/genfs_contexts index 9f1faca..da67863 100644 --- a/vendor/genfs_contexts +++ b/vendor/genfs_contexts @@ -33,6 +33,7 @@ genfscon sysfs /devices/platform/10ca0000.hsi2c/i2c-10/10-0036/power/wakeup genfscon sysfs /devices/platform/10ca0000.hsi2c/i2c-10/10-0036/power_supply/maxfg_secondary/power/wakeup u:object_r:sysfs_wakeup:s0 genfscon sysfs /devices/platform/10ca0000.hsi2c/i2c-10/10-0036/power_supply/maxfg_secondary/wakeup u:object_r:sysfs_wakeup:s0 genfscon sysfs /devices/platform/10ca0000.hsi2c/i2c-10/10-0036/wakeup u:object_r:sysfs_wakeup:s0 +genfscon sysfs /devices/platform/110f0000.drmdp/wakeup u:object_r:sysfs_wakeup:s0 genfscon sysfs /devices/platform/111c0000.spi/spi_master/spi19/spi19.0/synaptics_tcm.0/power/wakeup u:object_r:sysfs_wakeup:s0 genfscon sysfs /devices/platform/111c0000.spi/spi_master/spi19/spi19.0/synaptics_tcm.0/wakeup u:object_r:sysfs_wakeup:s0 genfscon sysfs /devices/platform/google,dual_batt_gauge/power_supply/dualbatt/power/wakeup u:object_r:sysfs_wakeup:s0 From 2eea667ffc845312950f22ee00a0057177188d18 Mon Sep 17 00:00:00 2001 From: Kiwon Park Date: Thu, 13 Jun 2024 17:24:00 +0000 Subject: [PATCH 4/5] Revert^2 "Allow vendor_init to set setupwizard prop" This reverts commit 28599c27ff189184e34d03c4893a33da83cf8683. Reason for revert: Doesn't fix the issues in factory testing Change-Id: I7a46078fb68b61b608296c1a1c509dd5cedfd1e2 --- comet-sepolicy.mk | 4 ++++ system_ext/private/gmscore_app.te | 2 ++ system_ext/private/priv_app.te | 2 ++ system_ext/private/property_contexts | 2 ++ system_ext/public/property.te | 2 ++ vendor/vendor_init.te | 3 +++ 6 files changed, 15 insertions(+) create mode 100644 system_ext/private/gmscore_app.te create mode 100644 system_ext/private/priv_app.te create mode 100644 system_ext/private/property_contexts create mode 100644 system_ext/public/property.te diff --git a/comet-sepolicy.mk b/comet-sepolicy.mk index 32aa697..3ffaa05 100644 --- a/comet-sepolicy.mk +++ b/comet-sepolicy.mk @@ -1,2 +1,6 @@ # sepolicy exclusively for comet. BOARD_SEPOLICY_DIRS += device/google/comet-sepolicy/vendor + +# system_ext +SYSTEM_EXT_PUBLIC_SEPOLICY_DIRS += device/google/comet-sepolicy/system_ext/public +SYSTEM_EXT_PRIVATE_SEPOLICY_DIRS += device/google/comet-sepolicy/system_ext/private diff --git a/system_ext/private/gmscore_app.te b/system_ext/private/gmscore_app.te new file mode 100644 index 0000000..4dc1639 --- /dev/null +++ b/system_ext/private/gmscore_app.te @@ -0,0 +1,2 @@ +# Allow to read setupwizard_feature_prop +get_prop(gmscore_app, setupwizard_feature_prop) diff --git a/system_ext/private/priv_app.te b/system_ext/private/priv_app.te new file mode 100644 index 0000000..90bc371 --- /dev/null +++ b/system_ext/private/priv_app.te @@ -0,0 +1,2 @@ +# Allow to read setupwizard_feature_prop +get_prop(priv_app, setupwizard_feature_prop) diff --git a/system_ext/private/property_contexts b/system_ext/private/property_contexts new file mode 100644 index 0000000..464a289 --- /dev/null +++ b/system_ext/private/property_contexts @@ -0,0 +1,2 @@ +# setupwizard +setupwizard.feature.provisioning_profile_mode u:object_r:setupwizard_feature_prop:s0 diff --git a/system_ext/public/property.te b/system_ext/public/property.te new file mode 100644 index 0000000..96cb3b3 --- /dev/null +++ b/system_ext/public/property.te @@ -0,0 +1,2 @@ +# setupwizard +system_public_prop(setupwizard_feature_prop) diff --git a/vendor/vendor_init.te b/vendor/vendor_init.te index 91d16a9..0af5c8a 100644 --- a/vendor/vendor_init.te +++ b/vendor/vendor_init.te @@ -1,2 +1,5 @@ # Camera vendor property set_prop(vendor_init, vendor_camera_debug_prop) + +# setupwizard +set_prop(vendor_init, setupwizard_feature_prop) From d6b057332c0969aebbc73e9f2e1d186a556c001a Mon Sep 17 00:00:00 2001 From: Achigo Liu Date: Thu, 13 Jun 2024 16:23:50 +0000 Subject: [PATCH 5/5] Revert^2 "Allow vendor_init to set setupwizard prop" dd5d44c6f6570e9b21709444751e795662f1dcb0 Change-Id: Id32f5409e88e377f96c0e774a13bbb2cec246bfa Merged-In: I7a46078fb68b61b608296c1a1c509dd5cedfd1e2 --- comet-sepolicy.mk | 4 ++++ system_ext/private/gmscore_app.te | 2 ++ system_ext/private/priv_app.te | 2 ++ system_ext/private/property_contexts | 2 ++ system_ext/public/property.te | 2 ++ vendor/vendor_init.te | 3 +++ 6 files changed, 15 insertions(+) create mode 100644 system_ext/private/gmscore_app.te create mode 100644 system_ext/private/priv_app.te create mode 100644 system_ext/private/property_contexts create mode 100644 system_ext/public/property.te diff --git a/comet-sepolicy.mk b/comet-sepolicy.mk index 32aa697..3ffaa05 100644 --- a/comet-sepolicy.mk +++ b/comet-sepolicy.mk @@ -1,2 +1,6 @@ # sepolicy exclusively for comet. BOARD_SEPOLICY_DIRS += device/google/comet-sepolicy/vendor + +# system_ext +SYSTEM_EXT_PUBLIC_SEPOLICY_DIRS += device/google/comet-sepolicy/system_ext/public +SYSTEM_EXT_PRIVATE_SEPOLICY_DIRS += device/google/comet-sepolicy/system_ext/private diff --git a/system_ext/private/gmscore_app.te b/system_ext/private/gmscore_app.te new file mode 100644 index 0000000..4dc1639 --- /dev/null +++ b/system_ext/private/gmscore_app.te @@ -0,0 +1,2 @@ +# Allow to read setupwizard_feature_prop +get_prop(gmscore_app, setupwizard_feature_prop) diff --git a/system_ext/private/priv_app.te b/system_ext/private/priv_app.te new file mode 100644 index 0000000..90bc371 --- /dev/null +++ b/system_ext/private/priv_app.te @@ -0,0 +1,2 @@ +# Allow to read setupwizard_feature_prop +get_prop(priv_app, setupwizard_feature_prop) diff --git a/system_ext/private/property_contexts b/system_ext/private/property_contexts new file mode 100644 index 0000000..464a289 --- /dev/null +++ b/system_ext/private/property_contexts @@ -0,0 +1,2 @@ +# setupwizard +setupwizard.feature.provisioning_profile_mode u:object_r:setupwizard_feature_prop:s0 diff --git a/system_ext/public/property.te b/system_ext/public/property.te new file mode 100644 index 0000000..96cb3b3 --- /dev/null +++ b/system_ext/public/property.te @@ -0,0 +1,2 @@ +# setupwizard +system_public_prop(setupwizard_feature_prop) diff --git a/vendor/vendor_init.te b/vendor/vendor_init.te index 91d16a9..0af5c8a 100644 --- a/vendor/vendor_init.te +++ b/vendor/vendor_init.te @@ -1,2 +1,5 @@ # Camera vendor property set_prop(vendor_init, vendor_camera_debug_prop) + +# setupwizard +set_prop(vendor_init, setupwizard_feature_prop)