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

Commit 74d3849d authored by Jeff Sharkey's avatar Jeff Sharkey Committed by Android Git Automerger
Browse files

am 2d73a5a4: am 2a9f87cf: am 5f809e3f: Merge "Avoid NPE when fsUuid is null." into mnc-dev 

* commit '2d73a5a4':
  Avoid NPE when fsUuid is null.
parents 3ee1c1c5 2d73a5a4

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;

            }

        }