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

Commit 29765d04 authored by Wale Ogunwale's avatar Wale Ogunwale Committed by Android (Google) Code Review
Browse files

Merge "Fixed NPE in Task#isResizeableByDockedStack"

parents 89ee6182 5e7409cf

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

    }



    /**