Merge "Fix a bug about missing onConfigurationChanged" into qt-dev (a54b943d) · Commits · e / os / android_frameworks_base

core/java/android/app/ActivityThread.java

+10 −9

Original line number	Diff line number	Diff line
		@@ -5564,15 +5564,9 @@ public final class ActivityThread extends ClientTransactionHandler {

		private void handleConfigurationChanged(Configuration config, CompatibilityInfo compat) {

		int configDiff = 0;
		int configDiff;
		boolean equivalent;

		// This flag tracks whether the new configuration is fundamentally equivalent to the
		// existing configuration. This is necessary to determine whether non-activity
		// callbacks should receive notice when the only changes are related to non-public fields.
		// We do not gate calling {@link #performActivityConfigurationChanged} based on this flag
		// as that method uses the same check on the activity config override as well.
		final boolean equivalent = config != null && mConfiguration != null
		&& (0 == mConfiguration.diffPublicOnly(config));
		final Theme systemTheme = getSystemContext().getTheme();
		final Theme systemUiTheme = getSystemUiContext().getTheme();

		@@ -5590,6 +5584,13 @@ public final class ActivityThread extends ClientTransactionHandler {
		return;
		}

		// This flag tracks whether the new configuration is fundamentally equivalent to the
		// existing configuration. This is necessary to determine whether non-activity callbacks
		// should receive notice when the only changes are related to non-public fields.
		// We do not gate calling {@link #performActivityConfigurationChanged} based on this
		// flag as that method uses the same check on the activity config override as well.
		equivalent = mConfiguration != null && (0 == mConfiguration.diffPublicOnly(config));

		if (DEBUG_CONFIGURATION) Slog.v(TAG, "Handle configuration changed: "
		+ config);