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

Commit a8c6c903 authored by android-build-team Robot's avatar android-build-team Robot
Browse files

Snap for 6516174 from fb4c0603 to rvc-release 

Change-Id: I7aa93a3f5e527d440d9916ad8f7b706e64a00fce
parents 38b7cc4d fb4c0603

Android.bp

+0 −4
Original line number Diff line number Diff line
@@ -41,7 +41,6 @@ java_defaults { 
    },



    sdk_version: "system_current",

    target_sdk_version: "29",

    min_sdk_version: "29",



    plugins: [
@@ -95,7 +94,6 @@ android_library { 
    ],



    sdk_version: "system_current",

    target_sdk_version: "29",

    min_sdk_version: "29",

}
@@ -118,7 +116,6 @@ android_library { 
    ],



    sdk_version: "system_current",

    target_sdk_version: "29",

    min_sdk_version: "29",

}
@@ -139,6 +136,5 @@ android_app { 


    required: ["privapp_whitelist_com.android.documentsui"],



    target_sdk_version: "29",

    min_sdk_version: "29",

}

AndroidManifest.xml

+1 −1
Original line number Diff line number Diff line
@@ -19,7 +19,7 @@ 
<manifest xmlns:android="http://schemas.android.com/apk/res/android"

        package="com.android.documentsui">



    <uses-sdk android:minSdkVersion="29" android:targetSdkVersion="29"/>

    <uses-sdk android:minSdkVersion="29" />



    <uses-permission android:name="android.permission.MANAGE_DOCUMENTS" />

    <uses-permission android:name="android.permission.REMOVE_TASKS" />

src/com/android/documentsui/files/Config.java

+2 −8
Original line number Diff line number Diff line
@@ -27,17 +27,11 @@ public final class Config extends ActivityConfig { 


    @Override

    public boolean managedModeEnabled(DocumentStack stack) {

        // This method helps us understand when to kick in special manage mode behaviors.

        final RootInfo root = stack.getRoot();



        // When in Files activity, allow External Storage provider to view

        // Android/[data|obb|sandbox] directories which are otherwise hidden for privacy reasons.

        if (root != null && root.isExternalStorage()) {

            return true;

        }

        // When in downloads top level directory, we also show active downloads.

        // And while we don't allow folders in Downloads, we do allow Zip files in

        // downloads that themselves can be opened and viewed like directories.

        // This method helps us understand when to kick in on those special behaviors.

        final RootInfo root = stack.getRoot();

        return root != null

                && root.isDownloads()

                && stack.size() == 1;

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

+0 −2
Original line number Diff line number Diff line
@@ -86,7 +86,6 @@ public class ContextMenuUiTest extends ActivityTest<FilesActivity> { 
    public void testContextMenu_onDir() throws Exception {

        menuItems.put("Cut", true);

        menuItems.put("Copy", true);

        menuItems.put("Paste into folder", true);

        menuItems.put("Open in new window", true);

        menuItems.put("Delete", true);

        menuItems.put("Rename", true);
@@ -106,7 +105,6 @@ public class ContextMenuUiTest extends ActivityTest<FilesActivity> { 


    public void testContextMenu_onEmptyArea() throws Exception {

        menuItems.put("Select all", true);

        menuItems.put("Paste", true);

        menuItems.put("New folder", true);

        Rect dirListBounds = bots.directory.findDocumentsList().getBounds();

        Rect dirBounds = bots.directory.findDocument(dirName1).getBounds();

tests/unit/com/android/documentsui/services/AbstractJobTest.java

+3 −0
Original line number Diff line number Diff line
@@ -76,6 +76,9 @@ public abstract class AbstractJobTest<T extends Job> extends AndroidTestCase { 


        mDocs = new DocumentsProviderHelper(mUserId, AUTHORITY, mContext, AUTHORITY);



        // Reset storage before starting the tests.

        resetStorage();



        initTestFiles();

    }