From 7a788a865e72da4205b5cf4e0a6f08ccb6f4bdbd Mon Sep 17 00:00:00 2001 From: Jeff Sharkey Date: Tue, 7 Jul 2015 14:33:55 -0700 Subject: [PATCH] Fix volume naming when surfaced over MTP. Otherwise we show everything as "Unknown." Bug: 22256092 Change-Id: I19fe8a25aff02db8ca9aff288e6715d469f65327 --- core/java/android/os/storage/VolumeInfo.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/core/java/android/os/storage/VolumeInfo.java b/core/java/android/os/storage/VolumeInfo.java index e33baa9ebdda3..91cb9443c0fc3 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; @@ -317,6 +317,9 @@ public class VolumeInfo implements Parcelable { } String description = getDescription(); + if (description == null) { + description = getFsUuid(); + } if (description == null) { description = context.getString(android.R.string.unknownName); }