summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--core/java/android/os/storage/VolumeInfo.java5
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);
}