Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Jeff Sharkey
2015-08-20 01:28:30 +00:00
committed by Android (Google) Code Review
parent 6a21a5a142 8e2ea2a9f1
commit f3ad1eabc1
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/java/android/os/storage/VolumeInfo.java
View File

@@ -341,6 +341,7 @@ public class VolumeInfo implements Parcelable {
} }
String description = null; String description = null;
String derivedFsUuid = fsUuid;
long mtpReserveSize = 0; long mtpReserveSize = 0;
long maxFileSize = 0; long maxFileSize = 0;
int mtpStorageId = StorageVolume.STORAGE_ID_INVALID; int mtpStorageId = StorageVolume.STORAGE_ID_INVALID;
@@ -351,6 +352,7 @@ public class VolumeInfo implements Parcelable {
final VolumeInfo privateVol = storage.findPrivateForEmulated(this); final VolumeInfo privateVol = storage.findPrivateForEmulated(this);
if (privateVol != null) { if (privateVol != null) {
description = storage.getBestVolumeDescription(privateVol); description = storage.getBestVolumeDescription(privateVol);
derivedFsUuid = privateVol.fsUuid;
} }
if (isPrimary()) { if (isPrimary()) {
@@ -393,7 +395,7 @@ public class VolumeInfo implements Parcelable {
return new StorageVolume(id, mtpStorageId, userPath, description, isPrimary(), removable, return new StorageVolume(id, mtpStorageId, userPath, description, isPrimary(), removable,
emulated, mtpReserveSize, allowMassStorage, maxFileSize, new UserHandle(userId), emulated, mtpReserveSize, allowMassStorage, maxFileSize, new UserHandle(userId),
fsUuid, envState); derivedFsUuid, envState);
} }
public static int buildStableMtpStorageId(String fsUuid) { public static int buildStableMtpStorageId(String fsUuid) {