commit c78b80667ca45f783f827716ceb892682f93db4b
author Treehugger Robot <treehugger-gerrit@google.com> Wed Apr 21 00:28:12 2021 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Apr 21 00:28:12 2021 +0000
tree 53855631ca994659fbd0d1933d829bd46c220d5e
parent 84742a3d92160b014464c514500bba7576cc159b
parent c171a1d9b68e2993672c70b1feadf002221d5f23

Merge "Make suspend_prop system_vendor_config_prop"

private/property.te

diff --git a/private/property.te b/private/property.te
index d6533e8..267ff85 100644
--- a/private/property.te
+++ b/private/property.te
@@ -298,7 +298,8 @@
 
   neverallow {
     domain
-    -init
+    -coredomain
+    -vendor_init
   } {
     suspend_prop
   }:property_service set;

public/property.te

diff --git a/public/property.te b/public/property.te
index 434f908..88da840 100644
--- a/public/property.te
+++ b/public/property.te
@@ -87,7 +87,6 @@
 system_restricted_prop(userspace_reboot_exported_prop)
 system_restricted_prop(vold_status_prop)
 system_restricted_prop(vts_status_prop)
-system_restricted_prop(suspend_prop)
 
 compatible_property_only(`
     # DO NOT ADD ANY PROPERTIES HERE
@@ -152,6 +151,7 @@
 system_vendor_config_prop(storage_config_prop)
 system_vendor_config_prop(storagemanager_config_prop)
 system_vendor_config_prop(surfaceflinger_prop)
+system_vendor_config_prop(suspend_prop)
 system_vendor_config_prop(systemsound_config_prop)
 system_vendor_config_prop(telephony_config_prop)
 system_vendor_config_prop(tombstone_config_prop)