From 409c038d3c356c5a9eb418b966d08375c0b65f37 Mon Sep 17 00:00:00 2001 From: Roman Kiryanov Date: Tue, 18 Aug 2020 01:41:13 +0000 Subject: [PATCH] Revert "Add persist.dumpstate.verbose_logging.enabled to system/..." Revert submission 1401269-dumpstate-prop Reason for revert: build break, "Failed to build policydb". Reverted Changes: I058100eac:Add persist.dumpstate.verbose_logging.enabled to s... Ia0656a3cb:Move hal_dumpstate's property from goldfish Change-Id: I3a49545d3ee69fdae54ad66e44ec28b6cbfb4b87 --- private/compat/30.0/30.0.ignore.cil | 1 - private/property.te | 6 ------ private/property_contexts | 1 - public/hal_dumpstate.te | 2 -- public/property.te | 1 - 5 files changed, 11 deletions(-) diff --git a/private/compat/30.0/30.0.ignore.cil b/private/compat/30.0/30.0.ignore.cil index f50cab47c..bcb571dfe 100644 --- a/private/compat/30.0/30.0.ignore.cil +++ b/private/compat/30.0/30.0.ignore.cil @@ -9,7 +9,6 @@ apex_info_file debugfs_kprobes gnss_device - hal_dumpstate_config_prop keystore2_key_contexts_file mediatranscoding_tmpfs people_service diff --git a/private/property.te b/private/property.te index 0c615189b..d62ea9c99 100644 --- a/private/property.te +++ b/private/property.te @@ -446,9 +446,3 @@ neverallow { -dumpstate -appdomain } camera_calibration_prop:file no_rw_file_perms; - -neverallow { - -init - -dumpstate - -hal_dumpstate -} hal_dumpstate_config_prop:file no_rw_file_perms; diff --git a/private/property_contexts b/private/property_contexts index 2397150e6..0c563fdd6 100644 --- a/private/property_contexts +++ b/private/property_contexts @@ -517,7 +517,6 @@ drm.service.enabled u:object_r:drm_service_config_prop:s0 exact bool dumpstate.dry_run u:object_r:exported_dumpstate_prop:s0 exact bool dumpstate.unroot u:object_r:exported_dumpstate_prop:s0 exact bool -persist.dumpstate.verbose_logging.enabled u:object_r:hal_dumpstate_config_prop:s0 exact bool hal.instrumentation.enable u:object_r:hal_instrumentation_prop:s0 exact bool diff --git a/public/hal_dumpstate.te b/public/hal_dumpstate.te index b7e14f8a5..b7676ed29 100644 --- a/public/hal_dumpstate.te +++ b/public/hal_dumpstate.te @@ -2,8 +2,6 @@ binder_call(hal_dumpstate_client, hal_dumpstate_server) binder_call(hal_dumpstate_server, hal_dumpstate_client) -set_prop(hal_dumpstate, hal_dumpstate_config_prop) - hal_attribute_hwservice(hal_dumpstate, hal_dumpstate_hwservice) # write bug reports in /data/data/com.android.shell/files/bugreports/bugreport diff --git a/public/property.te b/public/property.te index 34ed99959..3c913b1f5 100644 --- a/public/property.te +++ b/public/property.te @@ -169,7 +169,6 @@ 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(hal_dumpstate_config_prop) system_public_prop(sota_prop) system_public_prop(hwservicemanager_prop) system_public_prop(lmkd_prop)