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

Commit d207d81b authored by Ivan Chiang's avatar Ivan Chiang
Browse files

Remove legacy code for Home root 

We add new Documents root in MediaDocumentsProvider.
Remove unused Documents root in ExternalStorageProvider.

Bug: 148043686
Test: manual with DocumentsUI
Change-Id: I4278aa79cb1a9e22007b2946f8196d2a070be2c8
parent af5dfc2f

packages/ExternalStorageProvider/src/com/android/externalstorage/ExternalStorageProvider.java

+0 −36
Original line number Diff line number Diff line
@@ -38,7 +38,6 @@ import android.provider.DocumentsContract; 
import android.provider.DocumentsContract.Document;

import android.provider.DocumentsContract.Path;

import android.provider.DocumentsContract.Root;

import android.provider.MediaStore;

import android.provider.Settings;

import android.system.ErrnoException;

import android.system.Os;
@@ -100,7 +99,6 @@ public class ExternalStorageProvider extends FileSystemProvider { 


    private static final String ROOT_ID_PRIMARY_EMULATED =

            DocumentsContract.EXTERNAL_STORAGE_PRIMARY_EMULATED_ROOT_ID;

    private static final String ROOT_ID_HOME = "home";



    private static final String GET_DOCUMENT_URI_CALL = "get_document_uri";

    private static final String GET_MEDIA_URI_CALL = "get_media_uri";
@@ -156,7 +154,6 @@ public class ExternalStorageProvider extends FileSystemProvider { 
    private void updateVolumesLocked() {

        mRoots.clear();



        VolumeInfo primaryVolume = null;

        final int userId = UserHandle.myUserId();

        final List<VolumeInfo> volumes = mStorageManager.getVolumes();

        for (VolumeInfo volume : volumes) {
@@ -234,8 +231,6 @@ public class ExternalStorageProvider extends FileSystemProvider { 
            }



            if (volume.isPrimary()) {

                // save off the primary volume for subsequent "Home" dir initialization.

                primaryVolume = volume;

                root.flags |= Root.FLAG_ADVANCED;

            }

            // Dunno when this would NOT be the case, but never hurts to be correct.
@@ -259,37 +254,6 @@ public class ExternalStorageProvider extends FileSystemProvider { 
            }

        }



        // Finally, if primary storage is available we add the "Documents" directory.

        // If I recall correctly the actual directory is created on demand

        // by calling either getPathForUser, or getInternalPathForUser.

        if (primaryVolume != null && primaryVolume.isVisible()) {

            final RootInfo root = new RootInfo();

            root.rootId = ROOT_ID_HOME;

            mRoots.put(root.rootId, root);

            root.title = getContext().getString(R.string.root_documents);



            // Only report bytes on *volumes*...as a matter of policy.

            root.reportAvailableBytes = false;

            root.flags = Root.FLAG_LOCAL_ONLY | Root.FLAG_SUPPORTS_SEARCH

                    | Root.FLAG_SUPPORTS_IS_CHILD;



            // Dunno when this would NOT be the case, but never hurts to be correct.

            if (primaryVolume.isMountedWritable()) {

                root.flags |= Root.FLAG_SUPPORTS_CREATE;

            }



            // Create the "Documents" directory on disk (don't use the localized title).

            root.visiblePath = new File(

                    primaryVolume.getPathForUser(userId), Environment.DIRECTORY_DOCUMENTS);

            root.path = new File(

                    primaryVolume.getInternalPathForUser(userId), Environment.DIRECTORY_DOCUMENTS);

            try {

                root.docId = getDocIdForFile(root.path);

            } catch (FileNotFoundException e) {

                throw new IllegalStateException(e);

            }

        }



        Log.d(TAG, "After updating volumes, found " + mRoots.size() + " active roots");



        // Note this affects content://com.android.externalstorage.documents/root/39BD-07C5