Merge "Ignore dev option force_desktop_mode_on_external_displays" into main (5f4fb689) · Commits · e / os / android_frameworks_base

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

+2 −1

Original line number	Diff line number	Diff line
		@@ -5698,7 +5698,8 @@ class DisplayContent extends RootDisplayArea implements WindowManagerPolicy.Disp
		// This display is configured to show system decorations.
		return true;
		}
		if (isPublicSecondaryDisplayWithDesktopModeForceEnabled()) {
		if (!DesktopExperienceFlags.ENABLE_DISPLAY_CONTENT_MODE_MANAGEMENT.isTrue()
		&& isPublicSecondaryDisplayWithDesktopModeForceEnabled()) {
		if (com.android.window.flags.Flags.rearDisplayDisableForceDesktopSystemDecorations()) {
		// System decorations should not be forced on a rear display due to security
		// policies.