drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Use default volume description when missing label." into lmp-mr1-dev

Browse Source
This commit is contained in:
Jeff Sharkey
2014-10-24 21:32:59 +00:00
committed by Android (Google) Code Review
parent 91a1a7296b c99d00be67
commit cc66a236f9
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
packages/ExternalStorageProvider/src/com/android/externalstorage/ExternalStorageProvider.java
View File

@ -154,7 +154,12 @@ public class ExternalStorageProvider extends DocumentsProvider {
if (ROOT_ID_PRIMARY_EMULATED.equals(rootId)) { if (ROOT_ID_PRIMARY_EMULATED.equals(rootId)) {
root.title = getContext().getString(R.string.root_internal_storage); root.title = getContext().getString(R.string.root_internal_storage);
} else { } else {
root.title = volume.getUserLabel(); final String userLabel = volume.getUserLabel();
if (!TextUtils.isEmpty(userLabel)) {
root.title = userLabel;
} else {
root.title = volume.getDescription(getContext());
}
} }
root.docId = getDocIdForFile(path); root.docId = getDocIdForFile(path);
mRoots.add(root); mRoots.add(root);