From d40474ec55c3d2bcf372c7fcf2ffceec35026e21 Mon Sep 17 00:00:00 2001 From: Steven Moreland Date: Thu, 30 Mar 2017 16:39:02 -0700 Subject: [PATCH] Remove hal_binderization_prop Test: works on internal marlin Bug: 34274385 Change-Id: Idd35e5cdccb595b4e5994eb1d78fdeece0aec0a6 --- private/property_contexts | 1 - private/system_app.te | 1 - public/property.te | 1 - public/shell.te | 2 -- public/te_macros | 7 ------- 5 files changed, 12 deletions(-) diff --git a/private/property_contexts b/private/property_contexts index c205e594c..23150343f 100644 --- a/private/property_contexts +++ b/private/property_contexts @@ -57,7 +57,6 @@ persist.sys.audit_safemode u:object_r:safemode_prop:s0 persist.service. u:object_r:system_prop:s0 persist.service.bdroid. u:object_r:bluetooth_prop:s0 persist.security. u:object_r:system_prop:s0 -persist.hal.binderization u:object_r:hal_binderization_prop:s0 persist.vendor.overlay. u:object_r:overlay_prop:s0 ro.boot.vendor.overlay. u:object_r:overlay_prop:s0 ro.boottime. u:object_r:boottime_prop:s0 diff --git a/private/system_app.te b/private/system_app.te index 12ba6094f..606c4a07d 100644 --- a/private/system_app.te +++ b/private/system_app.te @@ -31,7 +31,6 @@ allow system_app icon_file:file r_file_perms; # Write to properties set_prop(system_app, bluetooth_prop) set_prop(system_app, debug_prop) -set_prop(system_app, hal_binderization_prop) set_prop(system_app, system_prop) set_prop(system_app, logd_prop) set_prop(system_app, net_radio_prop) diff --git a/public/property.te b/public/property.te index a3f5a1e43..daac0fb5c 100644 --- a/public/property.te +++ b/public/property.te @@ -43,7 +43,6 @@ type serialno_prop, property_type; type shell_prop, property_type, core_property_type; type system_prop, property_type, core_property_type; type system_radio_prop, property_type, core_property_type; -type hal_binderization_prop, property_type; type vold_prop, property_type, core_property_type; type wifi_log_prop, property_type, log_property_type; type wifi_prop, property_type; diff --git a/public/shell.te b/public/shell.te index 0e55f8490..ee8cf2a03 100644 --- a/public/shell.te +++ b/public/shell.te @@ -64,8 +64,6 @@ set_prop(shell, wifi_log_prop) userdebug_or_eng(`set_prop(shell, log_prop)') # logpersist script userdebug_or_eng(`set_prop(shell, logpersistd_logging_prop)') -# hal binderization -userdebug_or_eng(`set_prop(shell, hal_binderization_prop)') userdebug_or_eng(` # "systrace --boot" support - allow boottrace service to run diff --git a/public/te_macros b/public/te_macros index 57a038a23..bf75690b2 100644 --- a/public/te_macros +++ b/public/te_macros @@ -282,13 +282,6 @@ allow hwservicemanager $1:binder { call transfer }; allow hwservicemanager $1:dir search; allow hwservicemanager $1:file { read open }; allow hwservicemanager $1:process getattr; -# TODO(b/34274385): hals wait for data to be mounted so they can -# start only if persist.hal.binderization is enabled. (for dogfood -# stability). getService must also check for data to be mounted -# if the vintf promises the hal will be registered over hwbinder. -get_prop($1, hal_binderization_prop) -get_prop($1, persistent_properties_ready_prop) -get_prop($1, vold_prop) # rw access to /dev/hwbinder and /dev/ashmem is presently granted to # all domains in domain.te. ')