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

Commit 8e2ea2a9 authored by Jeff Sharkey's avatar Jeff Sharkey
Browse files

Pass underlying volume UUID to StorageVolume. 

To help MediaProvider uniquely identify storage devices, pass through
the UUID of the underlying private storage volume.

Bug: 23329611
Change-Id: I22ee7ea98fcb208d7797310acb3396a3f074f09b
parent 29cd8808

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