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

Commit bbb5717d authored by Jeff Sharkey's avatar Jeff Sharkey Committed by Android Git Automerger
Browse files

am f3ad1eab: Merge "Pass underlying volume UUID to StorageVolume." into mnc-dev 

* commit 'f3ad1eab':
  Pass underlying volume UUID to StorageVolume.
parents 37c11800 f3ad1eab

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