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

Commit 9118e512 authored by Maryam Dehaini's avatar Maryam Dehaini Committed by Android (Google) Code Review
Browse files

Merge "Add null check for view holder before closing" into main

parents 300aaee4 541d78c7

libs/WindowManager/Shell/src/com/android/wm/shell/windowdecor/DesktopModeWindowDecoration.java

+4 −2
Original line number Diff line number Diff line
@@ -1756,8 +1756,10 @@ public class DesktopModeWindowDecoration extends WindowDecoration<WindowDecorLin 
        mExclusionRegionListener.onExclusionRegionDismissed(mTaskInfo.taskId);

        disposeResizeVeil();

        disposeStatusBarInputLayer();

        if (mWindowDecorViewHolder != null) {

            mWindowDecorViewHolder.close();

            mWindowDecorViewHolder = null;

        }

        if (canEnterDesktopMode(mContext) && isEducationEnabled()) {

            notifyNoCaptionHandle();

        }