summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--services/core/java/com/android/server/wm/Transition.java11
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 25721280d97e..62ff60d0b5a2 100644
--- a/services/core/java/com/android/server/wm/Transition.java
+++ b/services/core/java/com/android/server/wm/Transition.java
@@ -3513,10 +3513,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);
}
/**