diff --git a/adbd.te b/adbd.te
index ba673f400..57b1e48e0 100644
--- a/adbd.te
+++ b/adbd.te
@@ -41,10 +41,11 @@ allow adbd sdcard_type:file create_file_perms;
 allow adbd anr_data_file:dir r_dir_perms;
 allow adbd anr_data_file:file r_file_perms;
 
-# Set service.adb.*, sys.powerctl properties.
+# Set service.adb.*, sys.powerctl, and sys.usb.ffs.ready properties.
 unix_socket_connect(adbd, property, init)
 allow adbd shell_prop:property_service set;
 allow adbd powerctl_prop:property_service set;
+allow adbd ffs_prop:property_service set;
 
 # Run /system/bin/bu
 allow adbd system_file:file rx_file_perms;
diff --git a/property.te b/property.te
index 6fedfa7a5..95c988a72 100644
--- a/property.te
+++ b/property.te
@@ -4,6 +4,7 @@ type debug_prop, property_type;
 type debuggerd_prop, property_type;
 type dhcp_prop, property_type;
 type fingerprint_prop, property_type;
+type ffs_prop, property_type;
 type radio_prop, property_type;
 type net_radio_prop, property_type;
 type system_radio_prop, property_type;
diff --git a/property_contexts b/property_contexts
index 06f6c174b..b28419722 100644
--- a/property_contexts
+++ b/property_contexts
@@ -20,6 +20,7 @@ runtime.                u:object_r:system_prop:s0
 hw.                     u:object_r:system_prop:s0
 sys.                    u:object_r:system_prop:s0
 sys.powerctl            u:object_r:powerctl_prop:s0
+sys.usb.ffs.            u:object_r:ffs_prop:s0
 service.                u:object_r:system_prop:s0
 wlan.                   u:object_r:system_prop:s0
 dhcp.                   u:object_r:dhcp_prop:s0