summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSvetoslav <svetoslavganov@google.com>2013-01-28 19:55:35 -0800
committerSvetoslav <svetoslavganov@google.com>2013-01-28 19:55:35 -0800
commit3a34d17412a5a304e39be1966a16627677d2136f (patch)
tree6f4cb2c0fab6282f1c0318b05200487191cc1021
parent91488eed1745ea0426a73306f133e02d62580f1a (diff)
downloadframeworks_base-3a34d17412a5a304e39be1966a16627677d2136f.zip
frameworks_base-3a34d17412a5a304e39be1966a16627677d2136f.tar.gz
frameworks_base-3a34d17412a5a304e39be1966a16627677d2136f.tar.bz2
Fixing the build
Change-Id: Ief7654775307c829a60e65217ae821aa6801303c
-rw-r--r--api/current.txt2
-rw-r--r--test-runner/src/android/test/InstrumentationTestRunner.java3
-rw-r--r--tests/AppLaunch/src/com/android/tests/applaunch/AppLaunch.java2
3 files changed, 3 insertions, 4 deletions
diff --git a/api/current.txt b/api/current.txt
index 14083b3..fab07f6 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -21330,7 +21330,7 @@ package android.test {
ctor public InstrumentationTestRunner();
method public junit.framework.TestSuite getAllTests();
method protected android.test.AndroidTestRunner getAndroidTestRunner();
- method protected android.os.Bundle getArguments();
+ method public android.os.Bundle getArguments();
method public java.lang.ClassLoader getLoader();
method public junit.framework.TestSuite getTestSuite();
field public static final java.lang.String REPORT_KEY_NAME_CLASS = "class";
diff --git a/test-runner/src/android/test/InstrumentationTestRunner.java b/test-runner/src/android/test/InstrumentationTestRunner.java
index 8e833ca..91d04da 100644
--- a/test-runner/src/android/test/InstrumentationTestRunner.java
+++ b/test-runner/src/android/test/InstrumentationTestRunner.java
@@ -21,7 +21,6 @@ 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;
@@ -395,7 +394,7 @@ public class InstrumentationTestRunner extends Instrumentation implements TestSu
*
* @return the Bundle object
*/
- protected Bundle getArguments() {
+ public Bundle getArguments() {
return mArguments;
}
diff --git a/tests/AppLaunch/src/com/android/tests/applaunch/AppLaunch.java b/tests/AppLaunch/src/com/android/tests/applaunch/AppLaunch.java
index e2cb65d..6b9f4c3 100644
--- a/tests/AppLaunch/src/com/android/tests/applaunch/AppLaunch.java
+++ b/tests/AppLaunch/src/com/android/tests/applaunch/AppLaunch.java
@@ -60,7 +60,7 @@ public class AppLaunch extends InstrumentationTestCase {
public void testMeasureStartUpTime() throws RemoteException {
InstrumentationTestRunner instrumentation =
(InstrumentationTestRunner)getInstrumentation();
- Bundle args = instrumentation.getBundle();
+ Bundle args = instrumentation.getArguments();
mAm = ActivityManagerNative.getDefault();
createMappings();