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

Commit 7ac75eb3 authored by Mady Mellor's avatar Mady Mellor Committed by Automerger Merge Worker
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 am: 2573d93f

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



Change-Id: I46aefd9d33e4bf89be6d806657233793c476d81a
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 34a55fcf 2573d93f

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

        }