summaryrefslogtreecommitdiffstats
path: root/test-runner/src
diff options
context:
space:
mode:
Diffstat (limited to 'test-runner/src')
-rw-r--r--test-runner/src/android/test/AndroidTestRunner.java1
-rw-r--r--test-runner/src/android/test/InstrumentationTestRunner.java6
2 files changed, 4 insertions, 3 deletions
diff --git a/test-runner/src/android/test/AndroidTestRunner.java b/test-runner/src/android/test/AndroidTestRunner.java
index 30876d0..aa7c677 100644
--- a/test-runner/src/android/test/AndroidTestRunner.java
+++ b/test-runner/src/android/test/AndroidTestRunner.java
@@ -21,6 +21,7 @@ import android.content.Context;
import android.os.PerformanceCollector.PerformanceResultsWriter;
import com.google.android.collect.Lists;
+
import junit.framework.Test;
import junit.framework.TestCase;
import junit.framework.TestListener;
diff --git a/test-runner/src/android/test/InstrumentationTestRunner.java b/test-runner/src/android/test/InstrumentationTestRunner.java
index 8e30875..8e833ca 100644
--- a/test-runner/src/android/test/InstrumentationTestRunner.java
+++ b/test-runner/src/android/test/InstrumentationTestRunner.java
@@ -21,6 +21,7 @@ import com.android.internal.util.Predicates;
import android.app.Activity;
import android.app.Instrumentation;
+import android.app.UiAutomation;
import android.os.Bundle;
import android.os.Debug;
import android.os.Looper;
@@ -390,12 +391,11 @@ public class InstrumentationTestRunner extends Instrumentation implements TestSu
}
/**
- * Get the Bundle object that contains the arguments
+ * Get the arguments passed to this instrumentation.
*
* @return the Bundle object
- * @hide
*/
- public Bundle getBundle(){
+ protected Bundle getArguments() {
return mArguments;
}