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

Commit 98016f75 authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

Support backward-compatible for Q am: a0d6f3db am: c04b9fe4 

Change-Id: I01141598ab873221e607039e24f034b6f2fac67b
parents 17d799db c04b9fe4

src/com/android/documentsui/base/DocumentInfo.java

+6 −1
Original line number Diff line number Diff line
@@ -35,6 +35,7 @@ import androidx.annotation.VisibleForTesting; 
import com.android.documentsui.DocumentsApplication;

import com.android.documentsui.archives.ArchivesProvider;

import com.android.documentsui.roots.RootCursorWrapper;

import com.android.documentsui.util.VersionUtils;



import java.io.DataInputStream;

import java.io.DataOutputStream;
@@ -309,7 +310,11 @@ public class DocumentInfo implements Durable, Parcelable { 
    }



    public boolean isBlockedFromTree() {

        if (VersionUtils.isAtLeastR()) {

            return (flags & Document.FLAG_DIR_BLOCKS_OPEN_DOCUMENT_TREE) != 0;

        } else {

            return false;

        }

    }



    // Containers are documents which can be opened in DocumentsUI as folders.

src/com/android/documentsui/base/Shared.java

+5 −0
Original line number Diff line number Diff line
@@ -47,6 +47,7 @@ import androidx.appcompat.app.AlertDialog; 


import com.android.documentsui.R;

import com.android.documentsui.ui.MessageBuilder;

import com.android.documentsui.util.VersionUtils;



import java.text.Collator;

import java.time.Instant;
@@ -170,6 +171,10 @@ public final class Shared { 
     * Whether the calling app should be restricted in Storage Access Framework or not.

     */

    public static boolean shouldRestrictStorageAccessFramework(Activity activity) {

        if (!VersionUtils.isAtLeastR()) {

            return false;

        }



        final String packageName = getCallingPackageName(activity);

        final boolean ret = CompatChanges.isChangeEnabled(RESTRICT_STORAGE_ACCESS_FRAMEWORK,

                packageName, Process.myUserHandle());

tests/unit/com/android/documentsui/dirlist/DirectoryAddonsAdapterTest.java

+10 −1
Original line number Diff line number Diff line
@@ -35,6 +35,7 @@ import com.android.documentsui.base.State; 
import com.android.documentsui.testing.TestActionHandler;

import com.android.documentsui.testing.TestEnv;

import com.android.documentsui.testing.TestFileTypeLookup;

import com.android.documentsui.util.VersionUtils;



@MediumTest

public class DirectoryAddonsAdapterTest extends AndroidTestCase {
@@ -142,6 +143,10 @@ public class DirectoryAddonsAdapterTest extends AndroidTestCase { 
    }



    public void testOpenTreeMessage_shouldBlockChild() {

        if (!VersionUtils.isAtLeastR()) {

            return;

        }



        mEnv.state.action = State.ACTION_OPEN_TREE;

        mEnv.state.restrictScopeStorage = true;

        DocumentInfo info = new DocumentInfo();
@@ -164,7 +169,11 @@ public class DirectoryAddonsAdapterTest extends AndroidTestCase { 
        assertHolderType(0, DocumentsAdapter.ITEM_TYPE_INFLATED_MESSAGE);

    }



    public void testOpenTreeMessage_restrictStorageAcceesFalse_blockTreeChild() {

    public void testOpenTreeMessage_restrictStorageAccessFalse_blockTreeChild() {

        if (!VersionUtils.isAtLeastR()) {

            return;

        }



        mEnv.state.action = State.ACTION_OPEN_TREE;

        DocumentInfo info = new DocumentInfo();

        info.flags += DocumentsContract.Document.FLAG_DIR_BLOCKS_OPEN_DOCUMENT_TREE;