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

Commit 5e7409cf authored by Wale Ogunwale's avatar Wale Ogunwale
Browse files

Fixed NPE in Task#isResizeableByDockedStack 

It is possible for the DisplayContent to be null.

Change-Id: I0a85038ae71a24fb5613237d771bc9222dd61cde
parent 89a2ed1e

services/core/java/com/android/server/wm/Task.java

+3 −2
Original line number Diff line number Diff line
@@ -558,8 +558,9 @@ class Task implements DimLayer.DimLayerUser { 
    }



    boolean isResizeableByDockedStack() {

        return mStack != null && getDisplayContent().getDockedStackLocked() != null &&

                StackId.isTaskResizeableByDockedStack(mStack.mStackId);

        final DisplayContent displayContent = getDisplayContent();

        return displayContent != null && displayContent.getDockedStackLocked() != null

                && mStack != null && StackId.isTaskResizeableByDockedStack(mStack.mStackId);

    }



    /**