commit 34560ec27df41375571d11a813dc5e76cac7cb56
author Julia Reynolds <juliacr@google.com> Mon Sep 24 13:11:00 2018 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Sep 24 13:11:00 2018 +0000
tree 8c82557c413d92642b0c255abbcbf2e282a7da99
parent 6f0b03d32a4f2cacbe1b06b9f730a3aff636d32c
parent 34a80841cb8fa8cdbe6c584831f0e531618d331d

Merge "Fix potential NPE"

core/java/android/app/NotificationManager.java

diff --git a/core/java/android/app/NotificationManager.java b/core/java/android/app/NotificationManager.java
index 9f819b9..07a8504 100644
--- a/core/java/android/app/NotificationManager.java
+++ b/core/java/android/app/NotificationManager.java
@@ -1636,11 +1636,14 @@
         try {
             final ParceledListSlice<StatusBarNotification> parceledList
                     = service.getAppActiveNotifications(pkg, mContext.getUserId());
-            final List<StatusBarNotification> list = parceledList.getList();
-            return list.toArray(new StatusBarNotification[list.size()]);
+            if (parceledList != null) {
+                final List<StatusBarNotification> list = parceledList.getList();
+                return list.toArray(new StatusBarNotification[list.size()]);
+            }
         } catch (RemoteException e) {
             throw e.rethrowFromSystemServer();
         }
+        return new StatusBarNotification[0];
     }
 
     /**