Merge "Fix possible NPE in StorageNotification."

2022-11-11 04:56:20 +00:00
parent 0064f5a020 a31fd42029
commit 7710eba48a
1 changed files with 1 additions and 1 deletions
--- a/packages/SystemUI/src/com/android/systemui/usb/StorageNotification.java
+++ b/packages/SystemUI/src/com/android/systemui/usb/StorageNotification.java
@@ -381,7 +381,7 @@ public class StorageNotification implements CoreStartable {

        // Don't annoy when user dismissed in past.  (But make sure the disk is adoptable; we
        // used to allow snoozing non-adoptable disks too.)
-        if (rec.isSnoozed() && disk.isAdoptable()) {
+        if (rec == null || (rec.isSnoozed() && disk.isAdoptable())) {
            return null;
        }
        if (disk.isAdoptable() && !rec.isInited() && rec.getType() != VolumeInfo.TYPE_PUBLIC