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

Commit 8ea2d5f7 authored by Selim Cinek's avatar Selim Cinek
Browse files

Fixed a crash when the heads up content view was null 

Change-Id: I02c47eb0f4bcc3620103882e34b079aa83790a44
Fixes: 28301534
parent c3b752e7

packages/SystemUI/src/com/android/systemui/statusbar/NotificationContentView.java

+8 −4
Original line number Diff line number Diff line
@@ -834,11 +834,15 @@ public class NotificationContentView extends FrameLayout { 
    public void updateExpandButtons(boolean expandable) {

        mExpandable = expandable;

        // if the expanded child has the same height as the collapsed one we hide it.

        if (mExpandedChild != null && mExpandedChild.getHeight() != 0 &&

                ((mIsHeadsUp && mExpandedChild.getHeight() == mHeadsUpChild.getHeight()) ||

                (!mIsHeadsUp && mExpandedChild.getHeight() == mContractedChild.getHeight()))) {

        if (mExpandedChild != null && mExpandedChild.getHeight() != 0) {

            if ((!mIsHeadsUp || mHeadsUpChild == null)) {

                if (mExpandedChild.getHeight() == mContractedChild.getHeight()) {

                    expandable = false;

                }

            } else if (mExpandedChild.getHeight() == mHeadsUpChild.getHeight()) {

                expandable = false;

            }

        }

        if (mExpandedChild != null) {

            mExpandedWrapper.updateExpandability(expandable, mExpandClickListener);

        }