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

Commit 8ffa6d21 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Check if ActivityView is non null in usingActivityView check"

parents 817faef2 323fb0b8

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) {