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

Commit 24ee77cf authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

Ignore home root from ExternalStorageProvider for Q am: 0e3146f1 

Change-Id: I7ab32410e6946b5364e83155b0372fb26e921a7e
parents a127ad5f 0e3146f1

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

+10 −0
Original line number Diff line number Diff line
@@ -298,6 +298,16 @@ public class RootInfo implements Durable, Parcelable, Comparable<RootInfo> { 
        return authority == null && rootId == null;

    }



    /**

     * Return true, if the root is from ExternalStorage and the id is home. Otherwise, return false.

     */

    public boolean isExternalStorageHome() {

        // Note that "home" is the expected root id for the auto-created

        // user home directory on external storage. The "home" value should

        // match ExternalStorageProvider.ROOT_ID_HOME.

        return isExternalStorage() && "home".equals(rootId);

    }



    public boolean isExternalStorage() {

        return Providers.AUTHORITY_STORAGE.equals(authority);

    }

src/com/android/documentsui/sidebar/RootsFragment.java

+3 −1
Original line number Diff line number Diff line
@@ -308,7 +308,9 @@ public class RootsFragment extends Fragment { 
        for (final RootInfo root : roots) {

            final RootItem item;



            if (root.isLibrary() || root.isDownloads()) {

            if (root.isExternalStorageHome()) {

                continue;

            } else if (root.isLibrary() || root.isDownloads()) {

                item = new RootItem(root, mActionHandler, maybeShowBadge);

                librariesBuilder.add(item);

            } else if (root.isStorage()) {