Merge "Always send configuration change if only desk uiMode changed" into main (b631ed26) · Commits · e / os / android_frameworks_base

core/java/android/app/ActivityThread.java

+37 −3

Original line number	Diff line number	Diff line
		@@ -29,6 +29,8 @@ import static android.app.servertransaction.ActivityLifecycleItem.ON_STOP;
		import static android.app.servertransaction.ActivityLifecycleItem.PRE_ON_CREATE;
		import static android.content.ContentResolver.DEPRECATE_DATA_COLUMNS;
		import static android.content.ContentResolver.DEPRECATE_DATA_PREFIX;
		import static android.content.res.Configuration.UI_MODE_TYPE_DESK;
		import static android.content.res.Configuration.UI_MODE_TYPE_MASK;
		import static android.view.Display.DEFAULT_DISPLAY;
		import static android.view.Display.INVALID_DISPLAY;
		import static android.window.ConfigurationHelper.freeTextLayoutCachesIfNeeded;
		@@ -206,6 +208,7 @@ import android.window.WindowContextInfo;
		import android.window.WindowProviderService;
		import android.window.WindowTokenClientController;

		import com.android.internal.R;
		import com.android.internal.annotations.GuardedBy;
		import com.android.internal.annotations.VisibleForTesting;
		import com.android.internal.app.IVoiceInteractor;
		@@ -6112,9 +6115,21 @@ public final class ActivityThread extends ClientTransactionHandler
		final boolean shouldUpdateResources = hasPublicResConfigChange
		\|\| shouldUpdateResources(activityToken, currentResConfig, newConfig,
		amOverrideConfig, movedToDifferentDisplay, hasPublicResConfigChange);
		final boolean shouldReportChange = shouldReportChange(
		activity.mCurrentConfig, newConfig, r.mSizeConfigurations,
		activity.mActivityInfo.getRealConfigChanged(), alwaysReportChange);

		// TODO(b/274944389): remove once a longer-term solution is implemented.
		boolean skipActivityRelaunchWhenDocking = activity.getResources().getBoolean(
		R.bool.config_skipActivityRelaunchWhenDocking);
		int handledConfigChanges = activity.mActivityInfo.getRealConfigChanged();
		if (skipActivityRelaunchWhenDocking && onlyDeskInUiModeChanged(activity.mCurrentConfig,
		newConfig)) {
		// If we're not relaunching this activity when docking, we should send the configuration
		// changed event. Pretend as if the activity is handling uiMode config changes in its
		// manifest so that we'll report any dock changes.
		handledConfigChanges \|= ActivityInfo.CONFIG_UI_MODE;
		}

		final boolean shouldReportChange = shouldReportChange(activity.mCurrentConfig, newConfig,
		r.mSizeConfigurations, handledConfigChanges, alwaysReportChange);
		// Nothing significant, don't proceed with updating and reporting.
		if (!shouldUpdateResources && !shouldReportChange) {
		return null;
		@@ -6160,6 +6175,25 @@ public final class ActivityThread extends ClientTransactionHandler
		return configToReport;
		}

		/**
		* Returns true if the uiMode configuration changed, and desk mode
		* ({@link android.content.res.Configuration#UI_MODE_TYPE_DESK}) was the only change to uiMode.
		*/
		private boolean onlyDeskInUiModeChanged(Configuration oldConfig, Configuration newConfig) {
		boolean deskModeChanged = isInDeskUiMode(oldConfig) != isInDeskUiMode(newConfig);

		// UI mode contains fields other than the UI mode type, so determine if any other fields
		// changed.
		boolean uiModeOtherFieldsChanged =
		(oldConfig.uiMode & ~UI_MODE_TYPE_MASK) != (newConfig.uiMode & ~UI_MODE_TYPE_MASK);

		return deskModeChanged && !uiModeOtherFieldsChanged;
		}

		private static boolean isInDeskUiMode(Configuration config) {
		return (config.uiMode & UI_MODE_TYPE_MASK) == UI_MODE_TYPE_DESK;
		}

		/**
		* Returns {@code true} if {@link Activity#onConfigurationChanged(Configuration)} should be
		* dispatched.