Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 189de9bc authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Catch bubbles exception in PeopleTiles" into sc-dev am: 2c95c763 

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

Change-Id: I8620aac4c330a5ea9e57a52323ce60fb722a16e1
parents 5b7b95fb 2c95c763

packages/SystemUI/src/com/android/systemui/people/NotificationHelper.java

+10 −3
Original line number Diff line number Diff line
@@ -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()

        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;

    }

}