Merge "Handle public volumes and otherwise invalid UUIDs." into pi-dev (ee1661f7) · Commits · e / os / android_frameworks_base

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) {