Merge "Clean up activity/stack associations." into oc-dev

diff --cc services/core/java/com/android/server/am/ActivityManagerService.java
Simple merge

diff --cc services/core/java/com/android/server/am/ActivityRecord.java
Simple merge

diff --cc services/core/java/com/android/server/am/ActivityStack.java
Simple merge

diff --cc services/core/java/com/android/server/am/ActivityStackSupervisor.java
Simple merge

diff --cc services/core/java/com/android/server/am/TaskRecord.java
index 27a2461,eeb14ec..0c2c204
--- 1/services/core/java/com/android/server/am/TaskRecord.java
--- 2/services/core/java/com/android/server/am/TaskRecord.java
+++ b/services/core/java/com/android/server/am/TaskRecord.java
@@@ -660,25 -636,13 +660,14 @@@ final class TaskRecord extends Configur
              // we are coming from in WM before we reparent because it became empty.
              mWindowContainerController.reparent(toStack.getWindowContainerController(), position);
  
-             // Reset the resumed activity on the previous stack
-             if (wasResumed) {
-                 sourceStack.mResumedActivity = null;
-             }
- 
-             // Reset the paused activity on the previous stack
-             if (wasPaused) {
-                 sourceStack.mPausingActivity = null;
-                 sourceStack.removeTimeoutsForActivityLocked(r);
-             }
- 
              // Move the task
              sourceStack.removeTask(this, reason, REMOVE_TASK_MODE_MOVING);
 -            toStack.addTask(this, position, reason);
 +            toStack.addTask(this, position, false /* schedulePictureInPictureModeChange */, reason);
  
 -            // TODO: Ensure that this is actually necessary here
 -            // Notify of picture-in-picture mode changes
 -            supervisor.scheduleReportPictureInPictureModeChangedIfNeeded(this, sourceStack);
 +            if (schedulePictureInPictureModeChange) {
 +                // Notify of picture-in-picture mode changes
 +                supervisor.scheduleUpdatePictureInPictureModeIfNeeded(this, sourceStack);
 +            }
  
              // TODO: Ensure that this is actually necessary here
              // Notify the voice session if required

diff --cc services/tests/servicestests/src/com/android/server/wm/DisplayContentTests.java
Simple merge

diff --cc services/tests/servicestests/src/com/android/server/wm/WindowFrameTests.java
Simple merge