Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a7d0cbe7 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

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

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

Change-Id: Ifdd37610fbe57ee1644f4d3a6683a31ba4bc514b
parents f8b50f03 073943f0
Loading
Loading
Loading
Loading
+12 −0
Original line number Diff line number Diff line
@@ -100,6 +100,13 @@ package android.test {
    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 {
    ctor public LoaderTestCase();
    method public <T> T getLoaderResultSynchronously(android.content.Loader<T>);
@@ -285,6 +292,11 @@ package android.test.suitebuilder {
    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 {
+1 −4
Original line number Diff line number Diff line
@@ -23,12 +23,11 @@ import android.os.Bundle;

/**
 * Base class for all launch performance Instrumentation classes.
 *
 * @hide
 */
@Deprecated
public class LaunchPerformanceBase extends Instrumentation {

    /** @hide */
    public static final String LOG_TAG = "Launch Performance";

    protected Bundle mResults;
@@ -43,8 +42,6 @@ public class LaunchPerformanceBase extends Instrumentation {

    /**
     * Launches intent, and waits for idle before returning.
     *
     * @hide
     */
    protected void LaunchApp() {
        startActivitySync(mIntent);
+2 −1
Original line number Diff line number Diff line
@@ -19,8 +19,9 @@ package android.test.suitebuilder;
/**
 * 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 UnitTestSuiteBuilder(Class clazz) {