commit 056d21f9066cfe7d8c87284a124a870d18578f78
author Yusuke Sato <yusukes@google.com> Thu Feb 25 19:34:27 2016 +0000
committer android-build-merger <android-build-merger@google.com> Thu Feb 25 19:34:27 2016 +0000
tree a766988ad356557e3a9d67a19faad237a2d714e3
parent 41508d6812cfbb7e13c6ae5511978dff390aed7b
parent ce7a54fad497f4b95773d94e744b1f4721bc9363

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

* commit '37c90df93111b5ce08720f8c614dd9e946679ac4':
  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)