commit 6130a3b03ceb41d3a2c26b73c0aeeed5ce00b32b
author TreeHugger Robot <treehugger-gerrit@google.com> Thu Nov 03 18:12:23 2016 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Nov 03 18:12:24 2016 +0000
tree 3d8dd93bd3482d45d46ee348b4269fe1b22c3825
parent 613dc67c7c6769651103ca484ab3192865e7a42e
parent aa5bdeb8bce9b273fa957b7cadbf447b99ea2d3b

Merge "Add debug wait to RunMethodInstrumentation" into ub-contactsdialer-h-dev

tests/src/com/android/contacts/RunMethodInstrumentation.java

diff --git a/tests/src/com/android/contacts/RunMethodInstrumentation.java b/tests/src/com/android/contacts/RunMethodInstrumentation.java
index f7e3970..d7ffee9 100644
--- a/tests/src/com/android/contacts/RunMethodInstrumentation.java
+++ b/tests/src/com/android/contacts/RunMethodInstrumentation.java
@@ -19,6 +19,7 @@
 import android.app.Instrumentation;
 import android.content.Context;
 import android.os.Bundle;
+import android.os.Debug;
 import android.support.test.InstrumentationRegistry;
 import android.util.Log;
 
@@ -62,6 +63,9 @@
         Log.d(TAG, "Running " + className + "." + methodName);
         Log.d(TAG, "args=" + args);
 
+        if (arguments.containsKey("debug") && Boolean.parseBoolean(arguments.getString("debug"))) {
+            Debug.waitForDebugger();
+        }
         start();
     }