Merge "Cache isIgnoreActivitySizeRestrictions" into main (b83c0f52) · Commits · e / os / android_frameworks_base

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

+9 −1

Original line number	Diff line number	Diff line
		@@ -790,6 +790,12 @@ class DisplayContent extends RootDisplayArea implements WindowManagerPolicy.Disp
		/** Last window to hold the screen locked. */
		private WindowState mLastWakeLockHoldingWindow;

		/**
		* Whether display is allowed to ignore all activity size restrictions.
		* @see #isDisplayIgnoreActivitySizeRestrictions
		*/
		private final boolean mIgnoreActivitySizeRestrictions;

		/**
		* The helper of policy controller.
		*
		@@ -1220,6 +1226,8 @@ class DisplayContent extends RootDisplayArea implements WindowManagerPolicy.Disp

		setWindowingMode(WINDOWING_MODE_FULLSCREEN);
		mWmService.mDisplayWindowSettings.applySettingsToDisplayLocked(this);
		mIgnoreActivitySizeRestrictions =
		mWmService.mDisplayWindowSettings.isIgnoreActivitySizeRestrictionsLocked(this);

		// Sets the initial touch mode state.
		mInTouchMode = mWmService.mContext.getResources().getBoolean(
		@@ -5810,7 +5818,7 @@ class DisplayContent extends RootDisplayArea implements WindowManagerPolicy.Disp
		* {@link VirtualDisplayConfig.Builder#setIgnoreActivitySizeRestrictions}.</p>
		*/
		boolean isDisplayIgnoreActivitySizeRestrictions() {
		return mWmService.mDisplayWindowSettings.isIgnoreActivitySizeRestrictionsLocked(this);
		return mIgnoreActivitySizeRestrictions;
		}

		/**