From 248b6dc64444ea3260fba8e9cb390e59e2b941ab Mon Sep 17 00:00:00 2001 From: Calin Juravle <calin@google.com> Date: Wed, 15 Nov 2017 22:09:55 +0000 Subject: [PATCH] Revert "Put pm.* property in new pm_prop context" This reverts commit d1cf3a405693172020d6199480968f2c4ecde64d. Reason for revert: It breaks CTS b/69309298 and other platform tests which read pm.dexopt properties. Change-Id: I5c7cde041113e9c19bb23218edd99f699fcf4a06 --- private/compat/26.0/26.0.cil | 3 +-- private/property_contexts | 1 - private/system_server.te | 1 - public/property.te | 1 - 4 files changed, 1 insertion(+), 5 deletions(-) diff --git a/private/compat/26.0/26.0.cil b/private/compat/26.0/26.0.cil index a1e6b5fde..89e5f7216 100644 --- a/private/compat/26.0/26.0.cil +++ b/private/compat/26.0/26.0.cil @@ -134,8 +134,7 @@ (typeattributeset default_android_hwservice_26_0 (default_android_hwservice)) (typeattributeset default_android_service_26_0 (default_android_service)) (typeattributeset default_android_vndservice_26_0 (default_android_vndservice)) -(typeattributeset default_prop_26_0 - ( default_prop pm_prop)) +(typeattributeset default_prop_26_0 (default_prop)) (typeattributeset device_26_0 (device)) (typeattributeset device_identifiers_service_26_0 (device_identifiers_service)) (typeattributeset deviceidle_service_26_0 (deviceidle_service)) diff --git a/private/property_contexts b/private/property_contexts index 1706224da..55974c041 100644 --- a/private/property_contexts +++ b/private/property_contexts @@ -68,7 +68,6 @@ ro.bt. u:object_r:bluetooth_prop:s0 ro.boot.bootreason u:object_r:bootloader_boot_reason_prop:s0 persist.sys.boot.reason u:object_r:last_boot_reason_prop:s0 sys.boot.reason u:object_r:system_boot_reason_prop:s0 -pm. u:object_r:pm_prop:s0 # Boolean property set by system server upon boot indicating # if device owner is provisioned. diff --git a/private/system_server.te b/private/system_server.te index 93c6a57ee..b38509c67 100644 --- a/private/system_server.te +++ b/private/system_server.te @@ -481,7 +481,6 @@ set_prop(system_server, fingerprint_prop) set_prop(system_server, device_logging_prop) set_prop(system_server, dumpstate_options_prop) set_prop(system_server, overlay_prop) -set_prop(system_server, pm_prop) userdebug_or_eng(`set_prop(system_server, wifi_log_prop)') # ctl interface diff --git a/public/property.te b/public/property.te index be84d4a97..713dc8373 100644 --- a/public/property.te +++ b/public/property.te @@ -39,7 +39,6 @@ type overlay_prop, property_type; type pan_result_prop, property_type, core_property_type; type persist_debug_prop, property_type, core_property_type; type persistent_properties_ready_prop, property_type; -type pm_prop, property_type; type powerctl_prop, property_type, core_property_type; type radio_prop, property_type, core_property_type; type restorecon_prop, property_type, core_property_type; -- GitLab