Merge "Update display before dispatching config change" into main (3557bf4c) · Commits · e / os / android_frameworks_base

core/java/android/window/WindowTokenClient.java

+5 −3

Original line number	Diff line number	Diff line
		@@ -167,6 +167,11 @@ public class WindowTokenClient extends Binder {
		+ ", reported config=" + currentConfig
		+ ", updated config=" + newConfig);
		}
		// Update display first. In case callers want to obtain display information(
		// ex: DisplayMetrics) in #onConfigurationChanged callback.
		if (displayChanged) {
		context.updateDisplay(newDisplayId);
		}
		if (shouldUpdateResources) {
		// TODO(ag/9789103): update resource manager logic to track non-activity tokens
		mResourcesManager.updateResourcesForActivity(this, newConfig, newDisplayId);
		@@ -195,9 +200,6 @@ public class WindowTokenClient extends Binder {
		}
		}
		}
		if (displayChanged) {
		context.updateDisplay(newDisplayId);
		}
		}

		/**