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

Commit cc66a236 authored by Jeff Sharkey's avatar Jeff Sharkey Committed by Android (Google) Code Review
Browse files

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

parents 91a1a729 c99d00be

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);