diff options
| -rw-r--r-- | core/java/android/service/notification/NotificationAssistantService.java | 9 | ||||
| -rw-r--r-- | core/java/android/service/notification/NotificationListenerService.java | 8 |
2 files changed, 17 insertions, 0 deletions
diff --git a/core/java/android/service/notification/NotificationAssistantService.java b/core/java/android/service/notification/NotificationAssistantService.java index 12d3228e567d..da4025419656 100644 --- a/core/java/android/service/notification/NotificationAssistantService.java +++ b/core/java/android/service/notification/NotificationAssistantService.java @@ -293,6 +293,11 @@ public abstract class NotificationAssistantService extends NotificationListenerS Log.w(TAG, "onNotificationEnqueued: Error receiving StatusBarNotification", e); return; } + if (sbn == null) { + Log.w(TAG, "onNotificationEnqueuedWithChannel: " + + "Error receiving StatusBarNotification"); + return; + } SomeArgs args = SomeArgs.obtain(); args.arg1 = sbn; @@ -311,6 +316,10 @@ public abstract class NotificationAssistantService extends NotificationListenerS Log.w(TAG, "onNotificationSnoozed: Error receiving StatusBarNotification", e); return; } + if (sbn == null) { + Log.w(TAG, "onNotificationSnoozed: Error receiving StatusBarNotification"); + return; + } SomeArgs args = SomeArgs.obtain(); args.arg1 = sbn; diff --git a/core/java/android/service/notification/NotificationListenerService.java b/core/java/android/service/notification/NotificationListenerService.java index b44c9d59ebe5..78e30ab8cdc3 100644 --- a/core/java/android/service/notification/NotificationListenerService.java +++ b/core/java/android/service/notification/NotificationListenerService.java @@ -1272,6 +1272,10 @@ public abstract class NotificationListenerService extends Service { Log.w(TAG, "onNotificationPosted: Error receiving StatusBarNotification", e); return; } + if (sbn == null) { + Log.w(TAG, "onNotificationPosted: Error receiving StatusBarNotification"); + return; + } try { // convert icon metadata to legacy format for older clients @@ -1313,6 +1317,10 @@ public abstract class NotificationListenerService extends Service { Log.w(TAG, "onNotificationRemoved: Error receiving StatusBarNotification", e); return; } + if (sbn == null) { + Log.w(TAG, "onNotificationRemoved: Error receiving StatusBarNotification"); + return; + } // protect subclass from concurrent modifications of (@link mNotificationKeys}. synchronized (mLock) { applyUpdateLocked(update); |