Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ea1841a3 authored by Jeff Sharkey's avatar Jeff Sharkey Committed by android-build-merger
Browse files

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

automerge: cc66a236

* commit 'cc66a236':
  Use default volume description when missing label.
parents eba0a750 cc66a236

packages/ExternalStorageProvider/src/com/android/externalstorage/ExternalStorageProvider.java

+6 −1
Original line number Diff line number Diff line
@@ -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);