diff --git a/dumpstate.te b/dumpstate.te
index 19eacfd056d35eca40f3fbab2e91a71ce7b776fa..1a001dcc719b658c3721e0352df9958b8a39e777 100644
--- a/dumpstate.te
+++ b/dumpstate.te
@@ -111,3 +111,7 @@ allow dumpstate { service_manager_type -gatekeeper_service }:service_manager fin
 allow dumpstate servicemanager:service_manager list;
 
 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)
diff --git a/property.te b/property.te
index 9e97b602761f9a7025dc277631bbf5a617f981b0..a9c5fe6dc31e6ac902f1d5d57d59eae513634daf 100644
--- a/property.te
+++ b/property.te
@@ -1,6 +1,7 @@
 type default_prop, property_type;
 type shell_prop, property_type;
 type debug_prop, property_type;
+type dumpstate_prop, property_type;
 type persist_debug_prop, property_type;
 type debuggerd_prop, property_type;
 type dhcp_prop, property_type;
diff --git a/property_contexts b/property_contexts
index 989be5a4108d82994e661b8d1d4b16b21b2fd08f..c1caed4268473822cca1011060acb6551e8c7051 100644
--- a/property_contexts
+++ b/property_contexts
@@ -29,6 +29,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
 log.                    u:object_r:shell_prop:s0
 service.adb.root        u:object_r:shell_prop:s0
 service.adb.tcp.port    u:object_r:shell_prop:s0
diff --git a/shell.te b/shell.te
index 90b12d87b6fde82d713cc3d801aa5aa1ce95166c..06d08a86e641dc53c37b41bbe91223c92a322802 100644
--- a/shell.te
+++ b/shell.te
@@ -62,7 +62,9 @@ r_dir_file(shell, apk_data_file)
 
 # Set properties.
 set_prop(shell, shell_prop)
+set_prop(shell, ctl_bugreport_prop)
 set_prop(shell, ctl_dumpstate_prop)
+set_prop(shell, dumpstate_prop)
 set_prop(shell, debug_prop)
 set_prop(shell, powerctl_prop)