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

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

Snap for 13088830 from a4a406e9 to 25Q2-release 

Change-Id: I30cb93d6803640a7c76739f178374aa021925948
parents b687f468 a4a406e9

src/com/android/documentsui/AbstractActionHandler.java

+2 −2
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ import static com.android.documentsui.base.DocumentInfo.getCursorInt; 
import static com.android.documentsui.base.DocumentInfo.getCursorString;

import static com.android.documentsui.base.SharedMinimal.DEBUG;

import static com.android.documentsui.flags.Flags.desktopFileHandling;

import static com.android.documentsui.flags.Flags.useSearchV2;

import static com.android.documentsui.flags.Flags.useSearchV2Rw;



import android.app.PendingIntent;

import android.content.ActivityNotFoundException;
@@ -916,7 +916,7 @@ public abstract class AbstractActionHandler<T extends FragmentActivity & CommonA 
                mState.stack.changeRoot(mActivity.getCurrentRoot());

            }



            if (useSearchV2()) {

            if (useSearchV2Rw()) {

                return onCreateLoaderV2(id, args);

            }

            return onCreateLoaderV1(id, args);

tests/unit/com/android/documentsui/files/ActionHandlerTest.java

+17 −0
Original line number Diff line number Diff line
@@ -810,6 +810,23 @@ public class ActionHandlerTest { 
        assertFalse(intent.getExtras().containsKey(Intent.EXTRA_TITLE));

    }



    @Test

    public void testViewInOwner() {

        mEnv.populateStack();



        mEnv.selectionMgr.clearSelection();

        mEnv.selectDocument(TestEnv.FILE_PNG);



        mHandler.viewInOwner();

        mActivity.assertActivityStarted(DocumentsContract.ACTION_DOCUMENT_SETTINGS);

    }



    @Test

    public void testOpenSettings() {

        mHandler.openSettings(TestProvidersAccess.HAMMY);

        mActivity.assertActivityStarted(DocumentsContract.ACTION_DOCUMENT_ROOT_SETTINGS);

    }



    private void assertRootPicked(Uri expectedUri) throws Exception {

        mEnv.beforeAsserts();