diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2020-06-15 15:29:45 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-06-15 15:29:45 +0000 |
| commit | 0bcd1b9f56d3462dff0325d0255ad2a0341ffe62 (patch) | |
| tree | aff5e82b802e0f23ec5413e7149d75f9c629981f /test-runner/src | |
| parent | fa9391feadabeea10ac84e4c5529a9b1cdffbebe (diff) | |
| parent | a7d0cbe7f6b10837ad1ed49e90a14ac24a7f0a1b (diff) | |
Merge "Make LaunchPerformanceBase and UnitTestSuiteBuilder as APIs" am: 073943f0fd am: a7d0cbe7f6
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1321319
Change-Id: I51471064908f8af5626f0edd8824d988875f0644
Diffstat (limited to 'test-runner/src')
| -rw-r--r-- | test-runner/src/android/test/LaunchPerformanceBase.java | 5 | ||||
| -rw-r--r-- | test-runner/src/android/test/suitebuilder/UnitTestSuiteBuilder.java | 3 |
2 files changed, 3 insertions, 5 deletions
diff --git a/test-runner/src/android/test/LaunchPerformanceBase.java b/test-runner/src/android/test/LaunchPerformanceBase.java index 62c90d6a4373..d87a8119ae16 100644 --- a/test-runner/src/android/test/LaunchPerformanceBase.java +++ b/test-runner/src/android/test/LaunchPerformanceBase.java @@ -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); diff --git a/test-runner/src/android/test/suitebuilder/UnitTestSuiteBuilder.java b/test-runner/src/android/test/suitebuilder/UnitTestSuiteBuilder.java index a746b35e19b7..ea7405b332c0 100644 --- a/test-runner/src/android/test/suitebuilder/UnitTestSuiteBuilder.java +++ b/test-runner/src/android/test/suitebuilder/UnitTestSuiteBuilder.java @@ -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) { |