From bc844c5c2b3af4c8b96f14e220aa1a87b51f0a4e Mon Sep 17 00:00:00 2001 From: Steven Terrell Date: Mon, 23 May 2022 19:13:29 +0000 Subject: [PATCH] Add System Property Controlling Animators Adding a new system property that will act as a toggle enabling/disabling the framework changes that were submitted to prevent leaked animators. Bug: 233391022 Test: manual. Ignore-AOSP-First: planning to commit to tm-dev then cherry-pick over to AOSP later. Change-Id: I57225feb50a3f3b4ac8c39998c47f263ae211b66 --- prebuilts/api/33.0/private/compat/32.0/32.0.ignore.cil | 1 + prebuilts/api/33.0/private/property_contexts | 3 +++ prebuilts/api/33.0/public/domain.te | 1 + prebuilts/api/33.0/public/property.te | 1 + private/compat/32.0/32.0.ignore.cil | 1 + private/property_contexts | 3 +++ public/domain.te | 1 + public/property.te | 1 + 8 files changed, 12 insertions(+) diff --git a/prebuilts/api/33.0/private/compat/32.0/32.0.ignore.cil b/prebuilts/api/33.0/private/compat/32.0/32.0.ignore.cil index 94a8fea62..a07f5ae44 100644 --- a/prebuilts/api/33.0/private/compat/32.0/32.0.ignore.cil +++ b/prebuilts/api/33.0/private/compat/32.0/32.0.ignore.cil @@ -27,6 +27,7 @@ evsmanagerd_service extra_free_kbytes extra_free_kbytes_exec + framework_status_prop fs_bpf_vendor game_mode_intervention_list_file gesture_prop diff --git a/prebuilts/api/33.0/private/property_contexts b/prebuilts/api/33.0/private/property_contexts index f19a60a7a..1b2360d18 100644 --- a/prebuilts/api/33.0/private/property_contexts +++ b/prebuilts/api/33.0/private/property_contexts @@ -1205,6 +1205,9 @@ cache_key.telephony. u:object_r:binder_cache_telephony_serve framework_watchdog.fatal_count u:object_r:framework_watchdog_config_prop:s0 exact int framework_watchdog.fatal_window.second u:object_r:framework_watchdog_config_prop:s0 exact int +# Framework configuration properties. +framework.pause_bg_animations.enabled u:object_r:framework_status_prop:s0 exact bool + gsm.operator.iso-country u:object_r:telephony_status_prop:s0 exact string gsm.sim.operator.iso-country u:object_r:telephony_status_prop:s0 exact string gsm.sim.operator.numeric u:object_r:telephony_status_prop:s0 exact string diff --git a/prebuilts/api/33.0/public/domain.te b/prebuilts/api/33.0/public/domain.te index 6258c7a0d..8e1fcf7c9 100644 --- a/prebuilts/api/33.0/public/domain.te +++ b/prebuilts/api/33.0/public/domain.te @@ -116,6 +116,7 @@ get_prop(domain, exported_dumpstate_prop) get_prop(domain, exported_secure_prop) get_prop(domain, exported_system_prop) get_prop(domain, fingerprint_prop) +get_prop(domain, framework_status_prop) get_prop(domain, gwp_asan_prop) get_prop(domain, hal_instrumentation_prop) get_prop(domain, hw_timeout_multiplier_prop) diff --git a/prebuilts/api/33.0/public/property.te b/prebuilts/api/33.0/public/property.te index b18f142bc..a235634cb 100644 --- a/prebuilts/api/33.0/public/property.te +++ b/prebuilts/api/33.0/public/property.te @@ -199,6 +199,7 @@ system_public_prop(exported_bluetooth_prop) system_public_prop(exported_overlay_prop) system_public_prop(exported_pm_prop) system_public_prop(ffs_control_prop) +system_public_prop(framework_status_prop) system_public_prop(gesture_prop) system_public_prop(hal_dumpstate_config_prop) system_public_prop(sota_prop) diff --git a/private/compat/32.0/32.0.ignore.cil b/private/compat/32.0/32.0.ignore.cil index 94a8fea62..a07f5ae44 100644 --- a/private/compat/32.0/32.0.ignore.cil +++ b/private/compat/32.0/32.0.ignore.cil @@ -27,6 +27,7 @@ evsmanagerd_service extra_free_kbytes extra_free_kbytes_exec + framework_status_prop fs_bpf_vendor game_mode_intervention_list_file gesture_prop diff --git a/private/property_contexts b/private/property_contexts index f19a60a7a..1b2360d18 100644 --- a/private/property_contexts +++ b/private/property_contexts @@ -1205,6 +1205,9 @@ cache_key.telephony. u:object_r:binder_cache_telephony_serve framework_watchdog.fatal_count u:object_r:framework_watchdog_config_prop:s0 exact int framework_watchdog.fatal_window.second u:object_r:framework_watchdog_config_prop:s0 exact int +# Framework configuration properties. +framework.pause_bg_animations.enabled u:object_r:framework_status_prop:s0 exact bool + gsm.operator.iso-country u:object_r:telephony_status_prop:s0 exact string gsm.sim.operator.iso-country u:object_r:telephony_status_prop:s0 exact string gsm.sim.operator.numeric u:object_r:telephony_status_prop:s0 exact string diff --git a/public/domain.te b/public/domain.te index 6258c7a0d..8e1fcf7c9 100644 --- a/public/domain.te +++ b/public/domain.te @@ -116,6 +116,7 @@ get_prop(domain, exported_dumpstate_prop) get_prop(domain, exported_secure_prop) get_prop(domain, exported_system_prop) get_prop(domain, fingerprint_prop) +get_prop(domain, framework_status_prop) get_prop(domain, gwp_asan_prop) get_prop(domain, hal_instrumentation_prop) get_prop(domain, hw_timeout_multiplier_prop) diff --git a/public/property.te b/public/property.te index b18f142bc..a235634cb 100644 --- a/public/property.te +++ b/public/property.te @@ -199,6 +199,7 @@ system_public_prop(exported_bluetooth_prop) system_public_prop(exported_overlay_prop) system_public_prop(exported_pm_prop) system_public_prop(ffs_control_prop) +system_public_prop(framework_status_prop) system_public_prop(gesture_prop) system_public_prop(hal_dumpstate_config_prop) system_public_prop(sota_prop)