diff options
| author | Jeff Sharkey <jsharkey@android.com> | 2015-07-07 14:33:55 -0700 |
|---|---|---|
| committer | Jeff Sharkey <jsharkey@android.com> | 2015-07-07 14:40:28 -0700 |
| commit | 7a788a865e72da4205b5cf4e0a6f08ccb6f4bdbd (patch) | |
| tree | b9e138b47e2e87b46b6907e51763d5049505362a | |
| parent | 384a04d93622c764bf1e8a69c288957d78b6a4e4 (diff) | |
| download | frameworks_base-7a788a865e72da4205b5cf4e0a6f08ccb6f4bdbd.zip frameworks_base-7a788a865e72da4205b5cf4e0a6f08ccb6f4bdbd.tar.gz frameworks_base-7a788a865e72da4205b5cf4e0a6f08ccb6f4bdbd.tar.bz2 | |
Fix volume naming when surfaced over MTP.
Otherwise we show everything as "Unknown."
Bug: 22256092
Change-Id: I19fe8a25aff02db8ca9aff288e6715d469f65327
| -rw-r--r-- | core/java/android/os/storage/VolumeInfo.java | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/core/java/android/os/storage/VolumeInfo.java b/core/java/android/os/storage/VolumeInfo.java index e33baa9..91cb944 100644 --- a/core/java/android/os/storage/VolumeInfo.java +++ b/core/java/android/os/storage/VolumeInfo.java @@ -232,7 +232,7 @@ public class VolumeInfo implements Parcelable { } public @Nullable String getDescription() { - if (ID_PRIVATE_INTERNAL.equals(id)) { + if (ID_PRIVATE_INTERNAL.equals(id) || ID_EMULATED_INTERNAL.equals(id)) { return Resources.getSystem().getString(com.android.internal.R.string.storage_internal); } else if (!TextUtils.isEmpty(fsLabel)) { return fsLabel; @@ -318,6 +318,9 @@ public class VolumeInfo implements Parcelable { String description = getDescription(); if (description == null) { + description = getFsUuid(); + } + if (description == null) { description = context.getString(android.R.string.unknownName); } |