diff options
| -rw-r--r-- | services/core/java/com/android/server/wm/ActivityRecord.java | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/services/core/java/com/android/server/wm/ActivityRecord.java b/services/core/java/com/android/server/wm/ActivityRecord.java index 8be338049435..efe07dc36646 100644 --- a/services/core/java/com/android/server/wm/ActivityRecord.java +++ b/services/core/java/com/android/server/wm/ActivityRecord.java @@ -2925,14 +2925,10 @@ final class ActivityRecord extends WindowToken implements WindowManagerService.A /** Makes starting window always fill the associated task. */ private void attachStartingSurfaceToAssociatedTask() { - if (mSyncState == SYNC_STATE_NONE && isEmbedded()) { - // Collect this activity since it's starting window will reparent to task. To ensure - // any starting window's transaction will occur in order. - mTransitionController.collect(this); - } + mTransitionController.collect(mStartingWindow); // Associate the configuration of starting window with the task. overrideConfigurationPropagation(mStartingWindow, mStartingData.mAssociatedTask); - getSyncTransaction().reparent(mStartingWindow.mSurfaceControl, + mStartingWindow.getSyncTransaction().reparent(mStartingWindow.mSurfaceControl, mStartingData.mAssociatedTask.mSurfaceControl); } |