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

Commit 7bb4ff97 authored by Jorge Gil's avatar Jorge Gil Committed by Android (Google) Code Review
Browse files

Merge "Fix NPE when referencing DragResizeInputListener" into main

parents d12f9e9a dc890d9d

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

+1 −1
Original line number Diff line number Diff line
@@ -287,7 +287,7 @@ public class CaptionWindowDecoration extends WindowDecoration<WindowDecorLinearL 
    }



    boolean isHandlingDragResize() {

        return mDragResizeListener.isHandlingDragResize();

        return mDragResizeListener != null && mDragResizeListener.isHandlingDragResize();

    }



    private void closeDragResizeListener() {

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

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



    boolean isHandlingDragResize() {

        return mDragResizeListener.isHandlingDragResize();

        return mDragResizeListener != null && mDragResizeListener.isHandlingDragResize();

    }



    private void loadAppInfo() {