diff options
| -rw-r--r-- | services/core/java/com/android/server/wm/DisplayContent.java | 2 | ||||
| -rw-r--r-- | services/core/java/com/android/server/wm/Transition.java | 3 |
2 files changed, 2 insertions, 3 deletions
diff --git a/services/core/java/com/android/server/wm/DisplayContent.java b/services/core/java/com/android/server/wm/DisplayContent.java index bb599363bdb5..50376fed2005 100644 --- a/services/core/java/com/android/server/wm/DisplayContent.java +++ b/services/core/java/com/android/server/wm/DisplayContent.java @@ -1648,7 +1648,7 @@ class DisplayContent extends RootDisplayArea implements WindowManagerPolicy.Disp ? new Transition.ReadyCondition("displayConfig", this) : null; if (displayConfig != null) { mTransitionController.waitFor(displayConfig); - } else if (mTransitionController.isShellTransitionsEnabled()) { + } else if (mTransitionController.isShellTransitionsEnabled() && mLastHasContent) { Slog.e(TAG, "Display reconfigured outside of a transition: " + this); } final boolean configUpdated = updateDisplayOverrideConfigurationLocked(); diff --git a/services/core/java/com/android/server/wm/Transition.java b/services/core/java/com/android/server/wm/Transition.java index caa57bb032ca..642d22f0bb9a 100644 --- a/services/core/java/com/android/server/wm/Transition.java +++ b/services/core/java/com/android/server/wm/Transition.java @@ -1737,8 +1737,8 @@ class Transition implements BLASTSyncEngine.TransactionReadyListener { // Since we created root-leash but no longer reference it from core, release it now info.releaseAnimSurfaces(); - mLogger.logOnSendAsync(mController.mLoggerHandler); if (mLogger.mInfo != null) { + mLogger.logOnSendAsync(mController.mLoggerHandler); mController.mTransitionTracer.logSentTransition(this, mTargets); } } @@ -3305,7 +3305,6 @@ class Transition implements BLASTSyncEngine.TransactionReadyListener { */ void addGroup(WindowContainer wc) { if (mReadyGroups.containsKey(wc)) { - Slog.e(TAG, "Trying to add a ready-group twice: " + wc); return; } mReadyGroups.put(wc, false); |