commit c51a0f9823a971946dfc2aec56e90b34abf4645f
author Yusuke Sato <yusukes@google.com> Thu Feb 25 19:35:52 2016 +0000
committer android-build-merger <android-build-merger@google.com> Thu Feb 25 19:35:52 2016 +0000
tree b77f1f63ab9dc9a17f5b9b252bf3e08a275604bf
parent 59cff0cc0146d15897b9a07c832099d01f08141d
parent 056d21f9066cfe7d8c87284a124a870d18578f78

Merge "Use ro.debuggable instead of ro.build.type" am: 37c90df931
am: 4e30b63fc6

* commit '4e30b63fc6049ec728d607b49632f287128074c7':
  Use ro.debuggable instead of ro.build.type

init/perfboot.py

diff --git a/init/perfboot.py b/init/perfboot.py
index 91e6c2b..713290b 100755
--- a/init/perfboot.py
+++ b/init/perfboot.py
@@ -191,9 +191,9 @@
 
 def init_perf(device, output, record_list, tags):
     device.wait()
-    build_type = device.get_prop('ro.build.type')
+    debuggable = device.get_prop('ro.debuggable')
     original_dropbox_max_files = None
-    if build_type != 'user':
+    if debuggable == '1':
         # Workaround for Dropbox issue (http://b/20890386).
         original_dropbox_max_files = disable_dropbox(device)