Merge "Catch bubbles exception in PeopleTiles" into sc-dev

This commit is contained in:
TreeHugger Robot
2021-06-17 13:26:52 +00:00
committed by Android (Google) Code Review

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