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

Commit 491a7c26 authored by Eghosa Ewansiha-Vlachavas's avatar Eghosa Ewansiha-Vlachavas Committed by Android (Google) Code Review
Browse files

Merge "Check if `mDragResizeListener` is null before use in... 

Merge "Check if `mDragResizeListener` is null before use in `DesktopModeWindowDecoration`" into main
parents 5eaccb5d 3620736b

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

+2 −2
Original line number Diff line number Diff line
@@ -425,7 +425,7 @@ public class DesktopModeWindowDecoration extends WindowDecoration<WindowDecorLin 
    }



    boolean shouldResizeListenerHandleEvent(MotionEvent e, Point offset) {

        return mDragResizeListener.shouldHandleEvent(e, offset);

        return mDragResizeListener != null && mDragResizeListener.shouldHandleEvent(e, offset);

    }



    boolean isHandlingDragResize() {
@@ -795,7 +795,7 @@ public class DesktopModeWindowDecoration extends WindowDecoration<WindowDecorLin 
     */

    private Region getGlobalExclusionRegion() {

        Region exclusionRegion;

        if (mTaskInfo.isResizeable) {

        if (mDragResizeListener != null && mTaskInfo.isResizeable) {

            exclusionRegion = mDragResizeListener.getCornersRegion();

        } else {

            exclusionRegion = new Region();