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

Commit b4073892 authored by Jeff Sharkey's avatar Jeff Sharkey Committed by android-build-merger
Browse files

Merge "Handle public volumes and otherwise invalid UUIDs." into pi-dev 

am: ee1661f7

Change-Id: Ibaed0d6289ce9312f2acc2701cea9cee90740492
parents 83a13307 ee1661f7

core/java/android/os/storage/StorageManager.java

+7 −2
Original line number Diff line number Diff line
@@ -756,10 +756,15 @@ public class StorageManager { 
        }

        try {

            for (VolumeInfo vol : mStorageManager.getVolumes(0)) {

                if (vol.path != null && FileUtils.contains(vol.path, pathString)) {

                if (vol.path != null && FileUtils.contains(vol.path, pathString)

                        && vol.type != VolumeInfo.TYPE_PUBLIC) {

                    // TODO: verify that emulated adopted devices have UUID of

                    // underlying volume

                    try {

                        return convert(vol.fsUuid);

                    } catch (IllegalArgumentException e) {

                        continue;

                    }

                }

            }

        } catch (RemoteException e) {