Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Make LaunchPerformanceBase and UnitTestSuiteBuilder as APIs" am: 073943f0fd

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1321319

Change-Id: Ifdd37610fbe57ee1644f4d3a6683a31ba4bc514b
This commit is contained in:
Treehugger Robot
2020-06-15 15:12:19 +00:00
committed by Automerger Merge Worker
parent f8b50f034a 073943f0fd
commit a7d0cbe7f6
3 changed files with 15 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
test-runner/api/current.txt
View File

@@ -100,6 +100,13 @@ package android.test {
method @Deprecated public java.util.List<android.content.Intent> getAndClearBroadcastIntents(); method @Deprecated public java.util.List<android.content.Intent> getAndClearBroadcastIntents();
} }
@Deprecated public class LaunchPerformanceBase extends android.app.Instrumentation {
ctor @Deprecated public LaunchPerformanceBase();
method @Deprecated protected void LaunchApp();
field @Deprecated protected android.content.Intent mIntent;
field @Deprecated protected android.os.Bundle mResults;
}
public class LoaderTestCase extends android.test.AndroidTestCase { public class LoaderTestCase extends android.test.AndroidTestCase {
ctor public LoaderTestCase(); ctor public LoaderTestCase();
method public <T> T getLoaderResultSynchronously(android.content.Loader<T>); method public <T> T getLoaderResultSynchronously(android.content.Loader<T>);
@@ -285,6 +292,11 @@ package android.test.suitebuilder {
method @Deprecated public void testSuiteConstructionFailed(); method @Deprecated public void testSuiteConstructionFailed();
} }
@Deprecated public class UnitTestSuiteBuilder extends android.test.suitebuilder.TestSuiteBuilder {
ctor @Deprecated public UnitTestSuiteBuilder(Class);
ctor @Deprecated public UnitTestSuiteBuilder(String, ClassLoader);
}
} }
package junit.runner { package junit.runner {

5
test-runner/src/android/test/LaunchPerformanceBase.java
View File

@@ -23,12 +23,11 @@ import android.os.Bundle;
/** /**
* Base class for all launch performance Instrumentation classes. * Base class for all launch performance Instrumentation classes.
*
* @hide
*/ */
@Deprecated @Deprecated
public class LaunchPerformanceBase extends Instrumentation { public class LaunchPerformanceBase extends Instrumentation {
/** @hide */
public static final String LOG_TAG = "Launch Performance"; public static final String LOG_TAG = "Launch Performance";
protected Bundle mResults; protected Bundle mResults;
@@ -43,8 +42,6 @@ public class LaunchPerformanceBase extends Instrumentation {
/** /**
* Launches intent, and waits for idle before returning. * Launches intent, and waits for idle before returning.
*
* @hide
*/ */
protected void LaunchApp() { protected void LaunchApp() {
startActivitySync(mIntent); startActivitySync(mIntent);

3
test-runner/src/android/test/suitebuilder/UnitTestSuiteBuilder.java
View File

@@ -19,8 +19,9 @@ package android.test.suitebuilder;
/** /**
* A suite builder that finds unit tests. * A suite builder that finds unit tests.
* *
* {@hide} Not needed for 1.0 SDK. * @deprecated android.test.runner is obsolete
*/ */
@Deprecated
public class UnitTestSuiteBuilder extends TestSuiteBuilder { public class UnitTestSuiteBuilder extends TestSuiteBuilder {
public UnitTestSuiteBuilder(Class clazz) { public UnitTestSuiteBuilder(Class clazz) {