diff options
author | Jeff Sharkey <jsharkey@android.com> | 2014-10-24 13:57:28 -0700 |
---|---|---|
committer | Jeff Sharkey <jsharkey@android.com> | 2014-10-24 13:57:47 -0700 |
commit | c99d00be675fa34944d47d340f4168564bd4cd64 (patch) | |
tree | b2ec81a014ebca3a07c339538fc5038526b9ee29 /packages/ExternalStorageProvider | |
parent | e41d967c5c6ff42ea41f61c731d77aa687b3956f (diff) | |
download | frameworks_base-c99d00be675fa34944d47d340f4168564bd4cd64.zip frameworks_base-c99d00be675fa34944d47d340f4168564bd4cd64.tar.gz frameworks_base-c99d00be675fa34944d47d340f4168564bd4cd64.tar.bz2 |
Use default volume description when missing label.
Some mounted storage volumes may not have a user-defined label. In
those cases, use the default description for the volume.
Bug: 17781505
Change-Id: I8558ba2615c2ff2647a5d44afaec83249df466ab
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); |