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

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

Merge "Avoid NPE when fsUuid is null." into mnc-dev

parents e678b41c c840681d

core/java/android/os/storage/StorageManager.java

+1 −1
Original line number Diff line number Diff line
@@ -584,7 +584,7 @@ public class StorageManager { 
        // Nickname always takes precedence when defined

        if (!TextUtils.isEmpty(vol.fsUuid)) {

            final VolumeRecord rec = findRecordByUuid(vol.fsUuid);

            if (!TextUtils.isEmpty(rec.nickname)) {

            if (rec != null && !TextUtils.isEmpty(rec.nickname)) {

                return rec.nickname;

            }

        }