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

Commit dc890d9d authored by Jorge Gil's avatar Jorge Gil
Browse files

Fix NPE when referencing DragResizeInputListener 

Some window decorations may have a null DragResizeInputListener (for
example, if the task is unresizable). Check for null before calling
isHandlingDragResize() when handling motion events.

Bug: 322571436
Test: drag-resize an unresizable freeform app, verify no NPE.
Change-Id: Idcd176df9fd9eb974635e87d89befbd4ef62ff44
parent 6561d91e

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