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

Commit 82910863 authored by Mady Mellor's avatar Mady Mellor Committed by Automerger Merge Worker
Browse files

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

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11844113

Change-Id: I600b9dafeaa42d22b13ea59342f161adbca09bb0
parents 378b9c7e 61d539cb

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