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

Commit 541d78c7 authored by Maryam Dehaini's avatar Maryam Dehaini
Browse files

Add null check for view holder before closing 

NullPointerExceptions thrown in tests when attempting to close a null view holder in DesktopModeWindowDecoration#close

Bug: 403310239 
Flag: com.android.window.flags.enable_desktop_windowing_mode
Test: run test
Change-Id: If28aa3e0e193efd50d840a5190917e825d264222
parent ea570188

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

        }