Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Prevent NPEs in NLSes"

Browse Source
This commit is contained in:
TreeHugger Robot
2019-08-07 21:05:57 +00:00
committed by Android (Google) Code Review
parent 0dd1be75c3 c562fc6937
commit 6faff849b6
2 changed files with 17 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
core/java/android/service/notification/NotificationAssistantService.java
View File

@@ -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;

8
core/java/android/service/notification/NotificationListenerService.java
View File

@@ -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);