Merge "Pass underlying volume UUID to StorageVolume." into mnc-dev (f3ad1eab) · Commits · e / os / android_frameworks_base

core/java/android/os/storage/VolumeInfo.java

+3 −1

Original line number	Diff line number	Diff line
		@@ -341,6 +341,7 @@ public class VolumeInfo implements Parcelable {
		}

		String description = null;
		String derivedFsUuid = fsUuid;
		long mtpReserveSize = 0;
		long maxFileSize = 0;
		int mtpStorageId = StorageVolume.STORAGE_ID_INVALID;
		@@ -351,6 +352,7 @@ public class VolumeInfo implements Parcelable {
		final VolumeInfo privateVol = storage.findPrivateForEmulated(this);
		if (privateVol != null) {
		description = storage.getBestVolumeDescription(privateVol);
		derivedFsUuid = privateVol.fsUuid;
		}

		if (isPrimary()) {
		@@ -393,7 +395,7 @@ public class VolumeInfo implements Parcelable {

		return new StorageVolume(id, mtpStorageId, userPath, description, isPrimary(), removable,
		emulated, mtpReserveSize, allowMassStorage, maxFileSize, new UserHandle(userId),
		fsUuid, envState);
		derivedFsUuid, envState);
		}

		public static int buildStableMtpStorageId(String fsUuid) {