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

Commit 3cb078c3 authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

Merge "Merge "AndroidTestCase.[set|get]TestContext are added as APIs" am:... 

Merge "Merge "AndroidTestCase.[set|get]TestContext are added as APIs" am: 5a7fb758 am: 3ae69503" into rvc-dev-plus-aosp am: 8a33169c am: 51645ccc

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

Change-Id: I9cc4d97b137031fbb87c32c47a2b480632c8da0d
parents 91dfd126 51645ccc

test-base/api/current.txt

+2 −0
Original line number Diff line number Diff line
@@ -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;

  }

test-base/src/android/test/AndroidTestCase.java

+1 −2
Original line number Diff line number Diff line
@@ -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;