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

Commit 5b23e88f authored by Craig Mautner's avatar Craig Mautner Committed by Android Git Automerger
Browse files

am 654ddc13: am 64d2ee09: Merge "Don\'t remove active stacks from window manager" into lmp-dev 

* commit '654ddc130ddc1c09fd51d45570767fb028a03a73':
  Don't remove active stacks from window manager
parents 2729013f c6ad70c1

services/core/java/com/android/server/am/ActivityStackSupervisor.java

+8 −7
Original line number Diff line number Diff line
@@ -3689,7 +3689,7 @@ public final class ActivityStackSupervisor implements DisplayListener { 
            }

        }



        private void detachLocked() {

        protected void detachLocked() {

            if (DEBUG_STACK) Slog.d(TAG, "detachLocked: " + this + " from display="

                    + mActivityDisplay + " Callers=" + Debug.getCallers(2));

            if (mActivityDisplay != null) {
@@ -3813,12 +3813,6 @@ public final class ActivityStackSupervisor implements DisplayListener { 
        }



        void onTaskListEmptyLocked() {

            mHandler.removeMessages(CONTAINER_TASK_LIST_EMPTY_TIMEOUT, this);

            if (!mStack.isHomeStack()) {

                detachLocked();

                deleteActivityContainer(this);

            }

            mHandler.obtainMessage(CONTAINER_CALLBACK_TASK_LIST_EMPTY, this).sendToTarget();

        }



        @Override
@@ -3907,6 +3901,13 @@ public final class ActivityStackSupervisor implements DisplayListener { 
            return false;

        }



        void onTaskListEmptyLocked() {

            mHandler.removeMessages(CONTAINER_TASK_LIST_EMPTY_TIMEOUT, this);

            detachLocked();

            deleteActivityContainer(this);

            mHandler.obtainMessage(CONTAINER_CALLBACK_TASK_LIST_EMPTY, this).sendToTarget();

        }



        private void setSurfaceIfReadyLocked() {

            if (DEBUG_STACK) Slog.v(TAG, "setSurfaceIfReadyLocked: mDrawn=" + mDrawn +

                    " mContainerState=" + mContainerState + " mSurface=" + mSurface);