commit 62ddcf0580576c20cbdc3bab96ad75a5ffe31172
author Woody Lin <woodylin@google.com> Tue Oct 27 08:22:14 2020 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Oct 27 08:22:14 2020 +0000
tree 6d0b52909c90d4e469768f09f9f39294fe5f0ffa
parent 0ac00727c307f1a6429b7bf07e61fad2815607e4
parent 8633462d85766012f08ba40cb481037db0b7ae28

Merge "Add zygote.critical_window.minute property"

private/compat/30.0/30.0.ignore.cil

diff --git a/private/compat/30.0/30.0.ignore.cil b/private/compat/30.0/30.0.ignore.cil
index 15fdabe..5cd658b 100644
--- a/private/compat/30.0/30.0.ignore.cil
+++ b/private/compat/30.0/30.0.ignore.cil
@@ -41,4 +41,5 @@
     update_engine_stable_service
     userspace_reboot_metadata_file
     vcn_management_service
-    vibrator_manager_service))
+    vibrator_manager_service
+    zygote_config_prop))

private/property_contexts

diff --git a/private/property_contexts b/private/property_contexts
index 55842e8..2b42baa 100644
--- a/private/property_contexts
+++ b/private/property_contexts
@@ -917,3 +917,6 @@
 
 # Disable/enable charger input
 power.battery_input.suspended u:object_r:power_debug_prop:s0 exact bool
+
+# zygote config property
+zygote.critical_window.minute u:object_r:zygote_config_prop:s0 exact int

public/property.te

diff --git a/public/property.te b/public/property.te
index 2849160..dfb5a3e 100644
--- a/public/property.te
+++ b/public/property.te
@@ -157,6 +157,7 @@
 system_vendor_config_prop(vold_config_prop)
 system_vendor_config_prop(wifi_config_prop)
 system_vendor_config_prop(zram_config_prop)
+system_vendor_config_prop(zygote_config_prop)
 
 # Properties with no restrictions
 system_public_prop(audio_prop)