Merge "Remove the flag: LOCAL_LAYOUT" into main (7efd3832) · Commits · e / os / android_frameworks_base

core/java/android/view/ViewRootImpl.java

+3 −11

Original line number	Diff line number	Diff line
		@@ -321,13 +321,6 @@ public final class ViewRootImpl implements ViewParent,
		public static final boolean CLIENT_IMMERSIVE_CONFIRMATION =
		SystemProperties.getBoolean("persist.wm.debug.client_immersive_confirmation", false);

		/**
		* Whether the client should compute the window frame on its own.
		* @hide
		*/
		public static final boolean LOCAL_LAYOUT =
		SystemProperties.getBoolean("persist.debug.local_layout", true);

		/**
		* Set this system property to true to force the view hierarchy to render
		* at 60 Hz. This can be used to measure the potential framerate.
		@@ -1912,8 +1905,8 @@ public final class ViewRootImpl implements ViewParent,
		final float compatScale = frames.compatScale;
		final boolean frameChanged = !mWinFrame.equals(frame);
		final boolean configChanged = !mLastReportedMergedConfiguration.equals(mergedConfiguration);
		final boolean attachedFrameChanged = LOCAL_LAYOUT
		&& !Objects.equals(mTmpFrames.attachedFrame, attachedFrame);
		final boolean attachedFrameChanged =
		!Objects.equals(mTmpFrames.attachedFrame, attachedFrame);
		final boolean displayChanged = mDisplay.getDisplayId() != displayId;
		final boolean compatScaleChanged = mTmpFrames.compatScale != compatScale;
		final boolean dragResizingChanged = mPendingDragResizing != dragResizing;
		@@ -8309,8 +8302,7 @@ public final class ViewRootImpl implements ViewParent,
		final int measuredWidth = mMeasuredWidth;
		final int measuredHeight = mMeasuredHeight;
		final boolean relayoutAsync;
		if (LOCAL_LAYOUT
		&& (mViewFrameInfo.flags & FrameInfo.FLAG_WINDOW_VISIBILITY_CHANGED) == 0
		if ((mViewFrameInfo.flags & FrameInfo.FLAG_WINDOW_VISIBILITY_CHANGED) == 0
		&& mWindowAttributes.type != TYPE_APPLICATION_STARTING
		&& mSyncSeqId <= mLastSyncSeqId
		&& winConfigFromAm.diff(winConfigFromWm, false /* compareUndefined */) == 0) {

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

+1 −4

Original line number	Diff line number	Diff line
		@@ -30,7 +30,6 @@ import static android.os.PowerManager.DRAW_WAKE_LOCK;
		import static android.os.Trace.TRACE_TAG_WINDOW_MANAGER;
		import static android.view.SurfaceControl.Transaction;
		import static android.view.SurfaceControl.getGlobalTransaction;
		import static android.view.ViewRootImpl.LOCAL_LAYOUT;
		import static android.view.ViewTreeObserver.InternalInsetsInfo.TOUCHABLE_INSETS_CONTENT;
		import static android.view.ViewTreeObserver.InternalInsetsInfo.TOUCHABLE_INSETS_FRAME;
		import static android.view.ViewTreeObserver.InternalInsetsInfo.TOUCHABLE_INSETS_REGION;
		@@ -1446,9 +1445,7 @@ class WindowState extends WindowContainer<WindowState> implements WindowManagerP
		}

		final boolean dragResizingChanged = !mDragResizingChangeReported && isDragResizeChanged();

		final boolean attachedFrameChanged = LOCAL_LAYOUT
		&& mLayoutAttached && getParentWindow().frameChanged();
		final boolean attachedFrameChanged = mLayoutAttached && getParentWindow().frameChanged();

		if (DEBUG) {
		Slog.v(TAG_WM, "Resizing " + this + ": configChanged=" + configChanged