Merge "Let system_server writes to dumpstate.options property." am: 60c436cb am: 7ba85b1c

am: 1bca4117

Change-Id: Ifc83a9abdfae96aa074d9c42f8b839a1a918241b

dumpstate.te

@@ -170,6 +170,8 @@ allow dumpstate devpts:chr_file rw_file_perms;
 # Set properties.
 # dumpstate_prop is used to share state with the Shell app.
 set_prop(dumpstate, dumpstate_prop)
+# dumpstate_options_prop is used to pass extra command-line args.
+set_prop(dumpstate, dumpstate_options_prop)
 
 # systrace support - allow atrace to run
 allow dumpstate debugfs_tracing:dir r_dir_perms;

property.te

@@ -2,6 +2,7 @@ type default_prop, property_type, core_property_type;
 type shell_prop, property_type, core_property_type;
 type debug_prop, property_type, core_property_type;
 type dumpstate_prop, property_type, core_property_type;
+type dumpstate_options_prop, property_type;
 type persist_debug_prop, property_type, core_property_type;
 type debuggerd_prop, property_type, core_property_type;
 type dhcp_prop, property_type, core_property_type;

property_contexts

@@ -32,6 +32,7 @@ bluetooth.              u:object_r:bluetooth_prop:s0
 debug.                  u:object_r:debug_prop:s0
 debug.db.               u:object_r:debuggerd_prop:s0
 dumpstate.              u:object_r:dumpstate_prop:s0
+dumpstate.options       u:object_r:dumpstate_options_prop:s0
 log.                    u:object_r:log_prop:s0
 log.tag                 u:object_r:log_tag_prop:s0
 log.tag.WifiHAL         u:object_r:wifi_log_prop:s0

system_server.te

@@ -349,6 +349,7 @@ set_prop(system_server, powerctl_prop)
 set_prop(system_server, fingerprint_prop)
 set_prop(system_server, device_logging_prop)
 set_prop(system_server, wifi_prop)
+set_prop(system_server, dumpstate_options_prop)
 userdebug_or_eng(`set_prop(system_server, wifi_log_prop)')
 
 # ctl interface