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

Commit 4140d8fe authored by Selim Cinek's avatar Selim Cinek Committed by android-build-merger
Browse files

Merge "Merge "Fixed a crash with the headsUpManager" into qt-dev am:... 

Merge "Merge "Fixed a crash with the headsUpManager" into qt-dev am: fcd42e92 am: 708890ba" into qt-r1-dev-plus-aosp
am: 3522f4bd

Change-Id: I36ccedceb5539f5daf2e9b706678461ba2b0d46f
parents 1ed03ab3 3522f4bd

packages/SystemUI/src/com/android/systemui/statusbar/phone/HeadsUpManagerPhone.java

+5 −2
Original line number Diff line number Diff line
@@ -363,12 +363,15 @@ public class HeadsUpManagerPhone extends HeadsUpManager implements Dumpable, 
    }



    public Region calculateTouchableRegion() {

        if (!hasPinnedHeadsUp()) {

        NotificationEntry topEntry = getTopEntry();

        // This call could be made in an inconsistent state while the pinnedMode hasn't been

        // updated yet, but callbacks leading out of the headsUp manager, querying it. Let's

        // therefore also check if the topEntry is null.

        if (!hasPinnedHeadsUp() || topEntry == null) {

            mTouchableRegion.set(0, 0, mStatusBarWindowView.getWidth(), mStatusBarHeight);

            updateRegionForNotch(mTouchableRegion);



        } else {

            NotificationEntry topEntry = getTopEntry();

            if (topEntry.isChildInGroup()) {

                final NotificationEntry groupSummary =

                        mGroupManager.getGroupSummary(topEntry.notification);