diff --git a/dumpstate.te b/dumpstate.te
index 2ed725da77d317ecd1d6d55fdf7d114d90bc1247..dd132a9879ad2979c16fd6796548f8f2f6d82f54 100644
--- a/dumpstate.te
+++ b/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;
diff --git a/property.te b/property.te
index 2802c0d33a462f91be97ad2d9159ca02a26a6898..2c2ddcce83ce7cf3de2d23d5b245783e93c62176 100644
--- a/property.te
+++ b/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;
diff --git a/property_contexts b/property_contexts
index 2ae1bb0f3d779152e87ce9eec36f49ab0433492f..34191db45de71be5a9edf906be01d64b5d355a49 100644
--- a/property_contexts
+++ b/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
diff --git a/system_server.te b/system_server.te
index 5ccc05f05a68e86c2fc28ddf80304e34805ec574..b9fe97b71311e4c61b1cd2743761c046fa84f38a 100644
--- a/system_server.te
+++ b/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