diff options
| author | Alex Stetson <alexstetson@google.com> | 2024-02-05 19:46:38 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2024-02-05 19:46:38 +0000 |
| commit | 34f9928b5db6d9065d2cea4d4088211d74dc4f0c (patch) | |
| tree | c6dadf45395a51a42e725c2af6322e6139568d53 | |
| parent | bbdd201487df3a3a98f05a0ebd41071f5858de8d (diff) | |
| parent | df14c7657d15b4be4dee451e7a901152798ffc4a (diff) | |
| download | base-android13-dev.tar.gz | |
Merge "Fix possible NPE in StorageNotification." into android13-devandroid13-dev
| -rw-r--r-- | packages/SystemUI/src/com/android/systemui/usb/StorageNotification.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/packages/SystemUI/src/com/android/systemui/usb/StorageNotification.java b/packages/SystemUI/src/com/android/systemui/usb/StorageNotification.java index 345fc99f8a54..f9bf17d97b8d 100644 --- a/packages/SystemUI/src/com/android/systemui/usb/StorageNotification.java +++ b/packages/SystemUI/src/com/android/systemui/usb/StorageNotification.java @@ -378,7 +378,7 @@ public class StorageNotification extends 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; } |