diff options
| -rw-r--r-- | services/core/java/com/android/server/wm/ActivityRecord.java | 2 | ||||
| -rw-r--r-- | services/core/java/com/android/server/wm/StartingData.java | 9 |
2 files changed, 10 insertions, 1 deletions
diff --git a/services/core/java/com/android/server/wm/ActivityRecord.java b/services/core/java/com/android/server/wm/ActivityRecord.java index ca3a84752fc4..5fcfb0dd069b 100644 --- a/services/core/java/com/android/server/wm/ActivityRecord.java +++ b/services/core/java/com/android/server/wm/ActivityRecord.java @@ -2884,7 +2884,7 @@ final class ActivityRecord extends WindowToken implements WindowManagerService.A final boolean animate; if (mStartingData != null) { if (mStartingData.mWaitForSyncTransactionCommit - || mTransitionController.inCollectingTransition(startingWindow)) { + || mTransitionController.isCollecting(this)) { mStartingData.mRemoveAfterTransaction = AFTER_TRANSACTION_REMOVE_DIRECTLY; mStartingData.mPrepareRemoveAnimation = prepareAnimation; return; diff --git a/services/core/java/com/android/server/wm/StartingData.java b/services/core/java/com/android/server/wm/StartingData.java index 2d281c476ec2..07ffa69e462a 100644 --- a/services/core/java/com/android/server/wm/StartingData.java +++ b/services/core/java/com/android/server/wm/StartingData.java @@ -108,4 +108,13 @@ public abstract class StartingData { boolean hasImeSurface() { return false; } + + @Override + public String toString() { + return getClass().getSimpleName() + "{" + + Integer.toHexString(System.identityHashCode(this)) + + " waitForSyncTransactionCommit=" + mWaitForSyncTransactionCommit + + " removeAfterTransaction= " + mRemoveAfterTransaction + + "}"; + } } |