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

Commit c840681d authored by Jeff Sharkey's avatar Jeff Sharkey
Browse files

Avoid NPE when fsUuid is null. 

Bug: 20822962
Change-Id: I6340b70dba5a4f94a0f08ddfbda0190db97746f1
parent 5d2c1d54

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;

            }

        }