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

Commit 6b1a93fc authored by Craig Mautner's avatar Craig Mautner Committed by Android Git Automerger
Browse files

am 3816fa8b: am 21ab13ff: am 474f1fbe: Merge "Don\'t null class member before... 

am 3816fa8b: am 21ab13ff: am 474f1fbe: Merge "Don\'t null class member before using it." into klp-modular-dev

* commit '3816fa8b':
  Don't null class member before using it.
parents 3e5ce55f 3816fa8b

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