am fb10a760: am 79204a32: am 15369c6c: Merge "Fix volume naming when surfaced... (6e77499a) · Commits · e / os / android_frameworks_base

core/java/android/os/storage/VolumeInfo.java

+4 −1

Original line number	Diff line number	Diff line
		@@ -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);
		}