From 04f520d1361874d0b8b07143a505788e66450c4f Mon Sep 17 00:00:00 2001 From: Jiyong Park Date: Mon, 1 Jun 2020 10:56:48 +0900 Subject: AndroidTestCase.[set|get]TestContext are added as APIs android.test.runner is using AndroidTestCase.[set|get]TestContext methods from android.test.base. The problem is that the methods are internal APIs and this is preventing us from hiding the impl library of android.test.base to others. Marking those two methods as APIs. Bug: 157007292 Test: m Test: android.test.runner Change-Id: I8ea5421723a4a40d580956e5ceb51be70253f0eb --- test-base/api/current.txt | 2 ++ test-base/src/android/test/AndroidTestCase.java | 3 +-- 2 files changed, 3 insertions(+), 2 deletions(-) (limited to 'test-base') diff --git a/test-base/api/current.txt b/test-base/api/current.txt index 750fb5988327..823e24db1782 100644 --- a/test-base/api/current.txt +++ b/test-base/api/current.txt @@ -7,8 +7,10 @@ package android.test { method @Deprecated public void assertReadingContentUriRequiresPermission(android.net.Uri, String); method @Deprecated public void assertWritingContentUriRequiresPermission(android.net.Uri, String); method @Deprecated public android.content.Context getContext(); + method @Deprecated public android.content.Context getTestContext(); method @Deprecated protected void scrubClass(Class) throws java.lang.IllegalAccessException; method @Deprecated public void setContext(android.content.Context); + method @Deprecated public void setTestContext(android.content.Context); method @Deprecated @android.test.suitebuilder.annotation.Suppress public void testAndroidTestCaseSetupProperly(); field @Deprecated protected android.content.Context mContext; } diff --git a/test-base/src/android/test/AndroidTestCase.java b/test-base/src/android/test/AndroidTestCase.java index 1e6bd9c14fd9..d3e896be0832 100644 --- a/test-base/src/android/test/AndroidTestCase.java +++ b/test-base/src/android/test/AndroidTestCase.java @@ -71,14 +71,13 @@ public class AndroidTestCase extends TestCase { * latter is provided by the context set with the {@link #setContext} * method. * - * @hide */ public void setTestContext(Context context) { mTestContext = context; } /** - * @hide + * Returns the test context that was set via {@link #setTestContext(Context)}. */ public Context getTestContext() { return mTestContext; -- cgit v1.2.3