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

Commit 0258f9f2 authored by Zimuzo Ezeozue's avatar Zimuzo Ezeozue Committed by Android (Google) Code Review
Browse files

Merge "Fix volumes registered in ExternalStorageProvider"

parents 838a6646 2dca320f

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

+3 −4
Original line number Diff line number Diff line
@@ -160,7 +160,7 @@ public class ExternalStorageProvider extends FileSystemProvider { 
        final int userId = UserHandle.myUserId();

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

        for (VolumeInfo volume : volumes) {

            if (!volume.isMountedReadable()) continue;

            if (!volume.isMountedReadable() || volume.getMountUserId() != userId) continue;



            final String rootId;

            final String title;
@@ -192,9 +192,8 @@ public class ExternalStorageProvider extends FileSystemProvider { 
                    title = mStorageManager.getBestVolumeDescription(privateVol);

                    storageUuid = StorageManager.convert(privateVol.fsUuid);

                }

            } else if ((volume.getType() == VolumeInfo.TYPE_PUBLIC

                            || volume.getType() == VolumeInfo.TYPE_STUB)

                    && volume.getMountUserId() == userId) {

            } else if (volume.getType() == VolumeInfo.TYPE_PUBLIC

                    || volume.getType() == VolumeInfo.TYPE_STUB) {

                rootId = volume.getFsUuid();

                title = mStorageManager.getBestVolumeDescription(volume);

                storageUuid = null;