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

Commit 474f1fbe authored by Craig Mautner's avatar Craig Mautner Committed by Android (Google) Code Review
Browse files

Merge "Don't null class member before using it." into klp-modular-dev

parents 0af894d2 991146f8

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

+1 −1
Original line number Diff line number Diff line
@@ -367,11 +367,11 @@ public class TaskStack { 
                (mDisplayContent.mDeferredActions & DisplayContent.DEFER_DETACH) != 0 &&

                !isAnimating()) {

            mDisplayContent.mDeferredActions &= ~DisplayContent.DEFER_DETACH;

            mService.detachStack(mStackId);

            if ((mDisplayContent.mDeferredActions & DisplayContent.DEFER_REMOVAL) != 0) {

                mDisplayContent.mDeferredActions &= ~DisplayContent.DEFER_REMOVAL;

                mService.onDisplayRemoved(mDisplayContent.getDisplayId());

            }

            mService.detachStack(mStackId);

        }

        for (int taskNdx = mTasks.size() - 1; taskNdx >= 0; --taskNdx) {

            final Task task = mTasks.get(taskNdx);