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

Merge "Protect against NPE" into rvc-dev am: 2d1efb2e6f am: 9ebbfa4718

Browse Source 
Original change: undetermined

Change-Id: I234998d3e105811a1f31c9a578e1333cb2453d7a
This commit is contained in:
TreeHugger Robot
2020-06-01 22:28:37 +00:00
committed by Automerger Merge Worker
parent e231852c73 9ebbfa4718
commit 21930b97ab
1 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
packages/SystemUI/src/com/android/systemui/bubbles/BubbleLoggerImpl.java
View File

@@ -17,6 +17,7 @@
package com.android.systemui.bubbles; package com.android.systemui.bubbles;
import android.service.notification.StatusBarNotification; import android.service.notification.StatusBarNotification;
import com.android.internal.logging.UiEventLoggerImpl; import com.android.internal.logging.UiEventLoggerImpl;
/** /**
@@ -31,6 +32,10 @@ public class BubbleLoggerImpl extends UiEventLoggerImpl implements BubbleLogger
* @param e UI event * @param e UI event
*/ */
public void log(Bubble b, UiEventEnum e) { public void log(Bubble b, UiEventEnum e) {
if (b.getEntry() == null) {
// Added from persistence -- TODO log this with specific event?
return;
}
StatusBarNotification sbn = b.getEntry().getSbn(); StatusBarNotification sbn = b.getEntry().getSbn();
logWithInstanceId(e, sbn.getUid(), sbn.getPackageName(), sbn.getInstanceId()); logWithInstanceId(e, sbn.getUid(), sbn.getPackageName(), sbn.getInstanceId());
} }