commit f9852941f0c3f48592bce265597881e39e95676c
author Josh Gao <jmgao@google.com> Mon Apr 29 17:32:49 2019 -0700
committer Josh Gao <jmgao@google.com> Mon Apr 29 17:36:18 2019 -0700
tree d0f68fc384582bdf33a8128fb44ca3e06384a649
parent e54b4a41bf4b8c214bf888ea0db10b4f06682775

Temporarily turn off adbd's nonblocking ffs implementation.

Bug: http://b/130638368
Test: none
Change-Id: I3eb74b031a8c93cbe549ca4b77253b3f77af8fb6

shared/device.mk

diff --git a/shared/device.mk b/shared/device.mk
index dbe84dc..e9359eb 100644
--- a/shared/device.mk
+++ b/shared/device.mk
@@ -31,7 +31,11 @@
     persist.adb.tcp.port=5555 \
     persist.traced.enable=1 \
     ro.com.google.locationfeatures=1 \
- 
+
+# Temporarily turn off nonblocking ffs until b/130638368 is resolved.
+PRODUCT_PRODUCT_PROPERTIES += \
+    ro.adb.nonblocking_ffs=0
+
 # Explanation of specific properties:
 #   debug.hwui.swap_with_damage avoids boot failure on M http://b/25152138
 #   ro.opengles.version OpenGLES 3.0