Skip to content
Snippets Groups Projects
Commit 2cdcdc6e authored by Mark Salyzyn's avatar Mark Salyzyn Committed by Android (Google) Code Review
Browse files

Merge "FrameworksServicesTests: allow access to test.sys.boot.reason property" into pi-dev

parents bb5b0a1e 1b748766
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 14 additions and 0 deletions
prebuilts/api/28.0/private/compat/26.0/26.0.ignore.cil
+ 1
− 0
View file @ 2cdcdc6e
...@@ -100,6 +100,7 @@ ...@@ -100,6 +100,7 @@
system_boot_reason_prop system_boot_reason_prop
system_net_netd_hwservice system_net_netd_hwservice
system_update_service system_update_service
test_boot_reason_prop
thermal_service thermal_service
thermalcallback_hwservice thermalcallback_hwservice
thermalserviced thermalserviced
......
prebuilts/api/28.0/private/compat/27.0/27.0.ignore.cil
+ 1
− 0
View file @ 2cdcdc6e
...@@ -85,6 +85,7 @@ ...@@ -85,6 +85,7 @@
storaged_data_file storaged_data_file
system_boot_reason_prop system_boot_reason_prop
system_update_service system_update_service
test_boot_reason_prop
tombstone_wifi_data_file tombstone_wifi_data_file
trace_data_file trace_data_file
traced traced
......
prebuilts/api/28.0/private/platform_app.te
+ 3
− 0
View file @ 2cdcdc6e
...@@ -74,6 +74,9 @@ read_runtime_log_tags(platform_app) ...@@ -74,6 +74,9 @@ read_runtime_log_tags(platform_app)
allow platform_app system_server:udp_socket { allow platform_app system_server:udp_socket {
connect getattr read recvfrom sendto write getopt setopt }; connect getattr read recvfrom sendto write getopt setopt };
# allow platform apps to connect to the property service
set_prop(platform_app, test_boot_reason_prop)
### ###
### Neverallow rules ### Neverallow rules
### ###
......
prebuilts/api/28.0/private/property_contexts
+ 1
− 0
View file @ 2cdcdc6e
...@@ -71,6 +71,7 @@ ro.boot.bootreason u:object_r:bootloader_boot_reason_prop:s0 ...@@ -71,6 +71,7 @@ ro.boot.bootreason u:object_r:bootloader_boot_reason_prop:s0
persist.sys.boot.reason u:object_r:last_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 sys.boot.reason u:object_r:system_boot_reason_prop:s0
pm. u:object_r:pm_prop:s0 pm. u:object_r:pm_prop:s0
test.sys.boot.reason u:object_r:test_boot_reason_prop:s0
# Boolean property set by system server upon boot indicating # Boolean property set by system server upon boot indicating
# if device owner is provisioned. # if device owner is provisioned.
......
prebuilts/api/28.0/public/property.te
+ 1
− 0
View file @ 2cdcdc6e
...@@ -51,6 +51,7 @@ type shell_prop, property_type, core_property_type; ...@@ -51,6 +51,7 @@ type shell_prop, property_type, core_property_type;
type system_boot_reason_prop, property_type; type system_boot_reason_prop, 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 test_boot_reason_prop, property_type;
type traced_enabled_prop, property_type; type traced_enabled_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;
......
private/compat/26.0/26.0.ignore.cil
+ 1
− 0
View file @ 2cdcdc6e
...@@ -100,6 +100,7 @@ ...@@ -100,6 +100,7 @@
system_boot_reason_prop system_boot_reason_prop
system_net_netd_hwservice system_net_netd_hwservice
system_update_service system_update_service
test_boot_reason_prop
thermal_service thermal_service
thermalcallback_hwservice thermalcallback_hwservice
thermalserviced thermalserviced
......
private/compat/27.0/27.0.ignore.cil
+ 1
− 0
View file @ 2cdcdc6e
...@@ -85,6 +85,7 @@ ...@@ -85,6 +85,7 @@
storaged_data_file storaged_data_file
system_boot_reason_prop system_boot_reason_prop
system_update_service system_update_service
test_boot_reason_prop
tombstone_wifi_data_file tombstone_wifi_data_file
trace_data_file trace_data_file
traced traced
......
private/platform_app.te
+ 3
− 0
View file @ 2cdcdc6e
...@@ -74,6 +74,9 @@ read_runtime_log_tags(platform_app) ...@@ -74,6 +74,9 @@ read_runtime_log_tags(platform_app)
allow platform_app system_server:udp_socket { allow platform_app system_server:udp_socket {
connect getattr read recvfrom sendto write getopt setopt }; connect getattr read recvfrom sendto write getopt setopt };
# allow platform apps to connect to the property service
set_prop(platform_app, test_boot_reason_prop)
### ###
### Neverallow rules ### Neverallow rules
### ###
......
private/property_contexts
+ 1
− 0
View file @ 2cdcdc6e
...@@ -71,6 +71,7 @@ ro.boot.bootreason u:object_r:bootloader_boot_reason_prop:s0 ...@@ -71,6 +71,7 @@ ro.boot.bootreason u:object_r:bootloader_boot_reason_prop:s0
persist.sys.boot.reason u:object_r:last_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 sys.boot.reason u:object_r:system_boot_reason_prop:s0
pm. u:object_r:pm_prop:s0 pm. u:object_r:pm_prop:s0
test.sys.boot.reason u:object_r:test_boot_reason_prop:s0
# Boolean property set by system server upon boot indicating # Boolean property set by system server upon boot indicating
# if device owner is provisioned. # if device owner is provisioned.
......
public/property.te
+ 1
− 0
View file @ 2cdcdc6e
...@@ -51,6 +51,7 @@ type shell_prop, property_type, core_property_type; ...@@ -51,6 +51,7 @@ type shell_prop, property_type, core_property_type;
type system_boot_reason_prop, property_type; type system_boot_reason_prop, 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 test_boot_reason_prop, property_type;
type traced_enabled_prop, property_type; type traced_enabled_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;
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment