Skip to content
Snippets Groups Projects
Commit 11468f37 authored by Steven Moreland's avatar Steven Moreland Committed by android-build-merger
Browse files

Merge "Remove hal_binderization_prop" am: 1871fc0a am: 2261cab6 am: 484a277c

am: 7138973f

Change-Id: I19217d9c4f428223beef29605ab4fd4f0a0db4b7
parents 5786f36b 7138973f
No related branches found
No related tags found
No related merge requests found
...@@ -57,7 +57,6 @@ persist.sys.audit_safemode u:object_r:safemode_prop:s0 ...@@ -57,7 +57,6 @@ persist.sys.audit_safemode u:object_r:safemode_prop:s0
persist.service. u:object_r:system_prop:s0 persist.service. u:object_r:system_prop:s0
persist.service.bdroid. u:object_r:bluetooth_prop:s0 persist.service.bdroid. u:object_r:bluetooth_prop:s0
persist.security. u:object_r:system_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 persist.vendor.overlay. u:object_r:overlay_prop:s0
ro.boot.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 ro.boottime. u:object_r:boottime_prop:s0
......
...@@ -31,7 +31,6 @@ allow system_app icon_file:file r_file_perms; ...@@ -31,7 +31,6 @@ allow system_app icon_file:file r_file_perms;
# Write to properties # Write to properties
set_prop(system_app, bluetooth_prop) set_prop(system_app, bluetooth_prop)
set_prop(system_app, debug_prop) set_prop(system_app, debug_prop)
set_prop(system_app, hal_binderization_prop)
set_prop(system_app, system_prop) set_prop(system_app, system_prop)
set_prop(system_app, logd_prop) set_prop(system_app, logd_prop)
set_prop(system_app, net_radio_prop) set_prop(system_app, net_radio_prop)
......
...@@ -44,7 +44,6 @@ type serialno_prop, property_type; ...@@ -44,7 +44,6 @@ type serialno_prop, property_type;
type shell_prop, property_type, core_property_type; type shell_prop, property_type, core_property_type;
type system_prop, property_type, core_property_type; type system_prop, property_type, core_property_type;
type system_radio_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 vold_prop, property_type, core_property_type;
type wifi_log_prop, property_type, log_property_type; type wifi_log_prop, property_type, log_property_type;
type wifi_prop, property_type; type wifi_prop, property_type;
......
...@@ -64,8 +64,6 @@ set_prop(shell, wifi_log_prop) ...@@ -64,8 +64,6 @@ set_prop(shell, wifi_log_prop)
userdebug_or_eng(`set_prop(shell, log_prop)') userdebug_or_eng(`set_prop(shell, log_prop)')
# logpersist script # logpersist script
userdebug_or_eng(`set_prop(shell, logpersistd_logging_prop)') userdebug_or_eng(`set_prop(shell, logpersistd_logging_prop)')
# hal binderization
userdebug_or_eng(`set_prop(shell, hal_binderization_prop)')
userdebug_or_eng(` userdebug_or_eng(`
# "systrace --boot" support - allow boottrace service to run # "systrace --boot" support - allow boottrace service to run
......
...@@ -282,13 +282,6 @@ allow hwservicemanager $1:binder { call transfer }; ...@@ -282,13 +282,6 @@ allow hwservicemanager $1:binder { call transfer };
allow hwservicemanager $1:dir search; allow hwservicemanager $1:dir search;
allow hwservicemanager $1:file { read open }; allow hwservicemanager $1:file { read open };
allow hwservicemanager $1:process getattr; 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 # rw access to /dev/hwbinder and /dev/ashmem is presently granted to
# all domains in domain.te. # all domains in domain.te.
') ')
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment