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

Commit 2573d93f authored by Mady Mellor's avatar Mady Mellor Committed by Android (Google) Code Review
Browse files

Merge "Fix NPE where BubbleExpandedView is null when we want to show manage... 

Merge "Fix NPE where BubbleExpandedView is null when we want to show manage education view" into tm-qpr-dev
parents 689f4b13 d0382078

libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/BubbleStackView.java

+1 −1
Original line number Diff line number Diff line
@@ -1270,7 +1270,7 @@ public class BubbleStackView extends FrameLayout 
        }

        final boolean seen = getPrefBoolean(ManageEducationViewKt.PREF_MANAGED_EDUCATION);

        final boolean shouldShow = (!seen || BubbleDebugConfig.forceShowUserEducation(mContext))

                && mExpandedBubble != null;

                && mExpandedBubble != null && mExpandedBubble.getExpandedView() != null;

        if (BubbleDebugConfig.DEBUG_USER_EDUCATION) {

            Log.d(TAG, "Show manage edu: " + shouldShow);

        }