commit 5f60bc8a0ec6700ad024c6feaededd4e39039eb7
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Fri Nov 15 21:17:05 2024 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Nov 15 21:17:05 2024 +0000
tree bdef80f075412b3d2a7854c0b386a100f454466a
parent 9c61b2649bc20e98ebf88b986239a4c98cd8c64e
parent 3b0c4c21c14312e75442dd18b9c9a50dadb97eeb

Merge "Fixed crash when user handle is null" into main

src/com/android/phone/NotificationMgr.java

diff --git a/src/com/android/phone/NotificationMgr.java b/src/com/android/phone/NotificationMgr.java
index 4fb96a2..188baaa 100644
--- a/src/com/android/phone/NotificationMgr.java
+++ b/src/com/android/phone/NotificationMgr.java
@@ -439,7 +439,10 @@
                 mUserManager.getSerialNumbersOfUsers(/* excludeDying= */ true);
         List<UserHandle> users = new ArrayList<>(serialNumbersOfUsers.length);
         for (long serialNumber : serialNumbersOfUsers) {
-            users.add(mUserManager.getUserForSerialNumber(serialNumber));
+            UserHandle userHandle = mUserManager.getUserForSerialNumber(serialNumber);
+            if (userHandle != null) {
+                users.add(userHandle);
+            }
         }
         return users;
     }