Merge "Change log message to avoid confusing about display config update" into main (b1c2654f) · Commits · e / os / android_frameworks_base

services/core/java/com/android/server/wm/DisplayContent.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -1627,7 +1627,7 @@ class DisplayContent extends RootDisplayArea implements WindowManagerPolicy.Disp
		if (displayConfig != null) {
		mTransitionController.waitFor(displayConfig);
		} else if (mTransitionController.isShellTransitionsEnabled() && mLastHasContent) {
		Slog.e(TAG, "Display reconfigured outside of a transition: " + this);
		Slog.d(TAG, "Direct invocation of sendNewConfiguration: " + this);
		}
		final boolean configUpdated = updateDisplayOverrideConfigurationLocked();
		if (displayConfig != null) {