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

* commit '2a9f87cfdf440ed6cfe92ab3428ca8d193586a2f': Avoid NPE when fsUuid is null.
2015-05-05 01:21:50 +00:00
parent ea7c3a1bc5 2a9f87cfdf
commit 2d73a5a46c
1 changed files with 1 additions and 1 deletions
--- a/core/java/android/os/storage/StorageManager.java
+++ b/core/java/android/os/storage/StorageManager.java
@@ -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;
            }
        }