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

Commit f2df8667 authored by Android Build Coastguard Worker's avatar Android Build Coastguard Worker
Browse files

Snap for 11361184 from 7d963af0 to 24Q2-release 

Change-Id: I529999f2fa25317ef43194fa9399cf1ec71a25b0
parents 65ecb427 7d963af0

tests/common/com/android/documentsui/dirlist/TestContext.java

+1 −1
Original line number Diff line number Diff line
@@ -30,7 +30,7 @@ public final class TestContext { 
     */

    static Context createStorageTestContext(Context context, String authority) {

        final MockContentResolver testResolver = new MockContentResolver();

        TestDocumentsProvider provider = new TestDocumentsProvider(authority);

        TestDocumentsProvider provider = new TestDocumentsProvider(context, authority);

        testResolver.addProvider(authority, provider);



        return new ContextWrapper(context) {

tests/common/com/android/documentsui/testing/TestDocumentsProvider.java

+3 −2
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ 
package com.android.documentsui.testing;



import android.annotation.NonNull;

import android.content.Context;

import android.content.pm.ProviderInfo;

import android.database.Cursor;

import android.database.MatrixCursor;
@@ -51,10 +52,10 @@ public class TestDocumentsProvider extends DocumentsProvider { 
    private Cursor mNextChildDocuments;

    private Cursor mNextRecentDocuments;



    public TestDocumentsProvider(String authority) {

    public TestDocumentsProvider(Context context, String authority) {

        ProviderInfo info = new ProviderInfo();

        info.authority = authority;

        attachInfoForTesting(null, info);

        attachInfoForTesting(context, info);

    }



    @Override

tests/common/com/android/documentsui/testing/TestEnv.java

+2 −1
Original line number Diff line number Diff line
@@ -117,7 +117,8 @@ public class TestEnv { 
    private void registerProviders() {

        for (RootInfo root : providers.getRootsBlocking()) {

            if (!mockProviders.containsKey(root.authority)) {

                TestDocumentsProvider provider = new TestDocumentsProvider(root.authority);

                Context context = InstrumentationRegistry.getInstrumentation().getTargetContext();

                TestDocumentsProvider provider = new TestDocumentsProvider(context, root.authority);

                contentResolver.addProvider(root.authority, provider);

                mockProviders.put(root.authority, provider);

            }

tests/functional/com/android/documentsui/ActionCreateDocumentUiTest.java

+1 −1
Original line number Diff line number Diff line
@@ -80,8 +80,8 @@ public class ActionCreateDocumentUiTest extends DocumentsUiTestBase { 
        final String fileName = UUID.randomUUID() + ".txt";



        bots.main.setDialogText(fileName);

        bots.main.clickSaveButton();

        device.waitForIdle();

        bots.main.clickSaveButton();



        final Instrumentation.ActivityResult activityResult = mRule.getActivityResult();

        assertThat(activityResult.getResultCode()).isEqualTo(RESULT_OK);