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

Commit 323fb0b8 authored by Mady Mellor's avatar Mady Mellor
Browse files

Check if ActivityView is non null in usingActivityView check 

Test: manual
Fixes: 129261800
Change-Id: Icd3e5fa46b32acff5286697ad38b9f6e73c5da3e
parent c6479fd8

packages/SystemUI/src/com/android/systemui/bubbles/BubbleExpandedView.java

+2 −2
Original line number Diff line number Diff line
@@ -437,7 +437,7 @@ public class BubbleExpandedView extends LinearLayout implements View.OnClickList 
    }



    boolean performBackPressIfNeeded() {

        if (mActivityView == null || !usingActivityView()) {

        if (!usingActivityView()) {

            return false;

        }

        mActivityView.performBackPress();
@@ -593,7 +593,7 @@ public class BubbleExpandedView extends LinearLayout implements View.OnClickList 
    }



    private boolean usingActivityView() {

        return mBubbleIntent != null;

        return mBubbleIntent != null && mActivityView != null;

    }



    private void applyRowState(ExpandableNotificationRow view) {