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

Merge "Catch bubbles exception in PeopleTiles" into sc-dev am: 2c95c7632a am: 189de9bc1d

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14946990

Change-Id: If28c7f06a7765d50d12be3521cfc28ee265531a7
This commit is contained in:
TreeHugger Robot
2021-06-17 13:51:10 +00:00
committed by Automerger Merge Worker
parent 9b32768a27 189de9bc1d
commit ca74f7bafd
1 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
packages/SystemUI/src/com/android/systemui/people/NotificationHelper.java
View File

@@ -240,9 +240,16 @@ public class NotificationHelper {
/** Returns whether {@code entry} is suppressed from shade, meaning we should not show it. */
public static boolean shouldFilterOut(
Optional<Bubbles> bubblesOptional, NotificationEntry entry) {
return bubblesOptional.isPresent()
&& bubblesOptional.get().isBubbleNotificationSuppressedFromShade(
entry.getKey(), entry.getSbn().getGroupKey());
boolean isSuppressed = false;
//TODO(b/190822282): Investigate what is causing the NullPointerException
try {
isSuppressed = bubblesOptional.isPresent()
&& bubblesOptional.get().isBubbleNotificationSuppressedFromShade(
entry.getKey(), entry.getSbn().getGroupKey());
} catch (Exception e) {
Log.e(TAG, "Exception checking if notification is suppressed: " + e);
}
return isSuppressed;
}
}