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

am fb10a760: am 79204a32: am 15369c6c: Merge "Fix volume naming when surfaced over MTP." into mnc-dev

Browse Source 
* commit 'fb10a760c660385d1abbd0ed45d0a72bb812e6d4':
  Fix volume naming when surfaced over MTP.
This commit is contained in:
Jeff Sharkey
2015-07-08 00:16:13 +00:00
committed by Android Git Automerger
parent 42e511d6c7 fb10a760c6
commit 6e77499a04
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -232,7 +232,7 @@ public class VolumeInfo implements Parcelable {
} }
public @Nullable String getDescription() { 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); return Resources.getSystem().getString(com.android.internal.R.string.storage_internal);
} else if (!TextUtils.isEmpty(fsLabel)) { } else if (!TextUtils.isEmpty(fsLabel)) {
return fsLabel; return fsLabel;
@@ -317,6 +317,9 @@ public class VolumeInfo implements Parcelable {
} }
String description = getDescription(); String description = getDescription();
if (description == null) {
description = getFsUuid();
}
if (description == null) { if (description == null) {
description = context.getString(android.R.string.unknownName); description = context.getString(android.R.string.unknownName);
} }