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

Commit f2b7d031 authored by Automerger Merge Worker's avatar Automerger Merge Worker Committed by Android (Google) Code Review
Browse files

Merge "Merge "Fix an obscure NPE" into rvc-dev am: fe96fa8b am: f4734b20... 

Merge "Merge "Fix an obscure NPE" into rvc-dev am: fe96fa8b am: f4734b20 am: 61d539cb" into rvc-qpr-dev-plus-aosp
parents a294d2a5 82910863

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

+5 −0
Original line number Diff line number Diff line
@@ -163,6 +163,11 @@ public class BubbleExpandedView extends LinearLayout { 
                            Log.d(TAG, "onActivityViewReady: calling startActivity, "

                                    + "bubble=" + getBubbleKey());

                        }

                        if (mActivityView == null) {

                            mBubbleController.removeBubble(getBubbleKey(),

                                    BubbleController.DISMISS_INVALID_INTENT);

                            return;

                        }

                        try {

                            if (!mIsOverflow && mBubble.usingShortcutInfo()) {

                                options.setApplyActivityFlagsForBubbles(true);