diff options
| author | 2024-06-26 05:44:49 +0000 | |
|---|---|---|
| committer | 2024-06-26 05:44:49 +0000 | |
| commit | c9626f21341eea76e672fc6922119cfd03a5b9b7 (patch) | |
| tree | 9c585b1032ce99aaaffbd7d0ab09462c3dae3f2a | |
| parent | 0ed9e0d96e6c1d2e497199b4bbcf8fe91f10c3fc (diff) | |
| parent | 3d9e35ccb7b0dd6032e23ad85611a01c8148e436 (diff) | |
Merge "Apply display change for non-started transition" into main
| -rw-r--r-- | services/core/java/com/android/server/wm/Transition.java | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/services/core/java/com/android/server/wm/Transition.java b/services/core/java/com/android/server/wm/Transition.java index 33b604c367c0..5f6abf527a7d 100644 --- a/services/core/java/com/android/server/wm/Transition.java +++ b/services/core/java/com/android/server/wm/Transition.java @@ -3519,10 +3519,15 @@ class Transition implements BLASTSyncEngine.TransactionReadyListener { Slog.e(TAG, "#" + mSyncId + " readiness timeout, used=" + mReadyTrackerOld.mUsed + " deferReadyDepth=" + mReadyTrackerOld.mDeferReadyDepth + " group=" + mReadyTrackerOld.mReadyGroups); - return; + } else { + Slog.e(TAG, "#" + mSyncId + " met conditions: " + mReadyTracker.mMet); + Slog.e(TAG, "#" + mSyncId + " unmet conditions: " + mReadyTracker.mConditions); + } + // Make sure the pending display change can be applied (especially DC#mWaitingForConfig) + // in case shell hasn't called WindowOrganizerController#startTransition yet. + if (mState < STATE_STARTED && this == mController.getCollectingTransition()) { + applyDisplayChangeIfNeeded(new ArraySet<>()); } - Slog.e(TAG, "#" + mSyncId + " met conditions: " + mReadyTracker.mMet); - Slog.e(TAG, "#" + mSyncId + " unmet conditions: " + mReadyTracker.mConditions); } /** |