diff options
| author | Jeff Sharkey <jsharkey@android.com> | 2014-10-24 23:03:19 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-10-24 23:03:19 +0000 |
| commit | 1b632db2074365a7094177f655a4f750807f61f0 (patch) | |
| tree | 959b8ac23fc5c7071272f9e35019a28484d3503e /packages/ExternalStorageProvider | |
| parent | 51547e750e30801e2d367433d8cd59f6b77fdc8c (diff) | |
| parent | ea1841a3c1015b53e19ace727f9ebe5a75f87dc1 (diff) | |
| download | frameworks_base-1b632db2074365a7094177f655a4f750807f61f0.zip frameworks_base-1b632db2074365a7094177f655a4f750807f61f0.tar.gz frameworks_base-1b632db2074365a7094177f655a4f750807f61f0.tar.bz2 | |
am ea1841a3: Merge "Use default volume description when missing label." into lmp-mr1-dev automerge: cc66a23
* commit 'ea1841a3c1015b53e19ace727f9ebe5a75f87dc1':
Use default volume description when missing label.
Diffstat (limited to 'packages/ExternalStorageProvider')
| -rw-r--r-- | packages/ExternalStorageProvider/src/com/android/externalstorage/ExternalStorageProvider.java | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/packages/ExternalStorageProvider/src/com/android/externalstorage/ExternalStorageProvider.java b/packages/ExternalStorageProvider/src/com/android/externalstorage/ExternalStorageProvider.java index c323a33..066acac 100644 --- a/packages/ExternalStorageProvider/src/com/android/externalstorage/ExternalStorageProvider.java +++ b/packages/ExternalStorageProvider/src/com/android/externalstorage/ExternalStorageProvider.java @@ -154,7 +154,12 @@ public class ExternalStorageProvider extends DocumentsProvider { if (ROOT_ID_PRIMARY_EMULATED.equals(rootId)) { root.title = getContext().getString(R.string.root_internal_storage); } 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); mRoots.add(root); |