Merge "Cleanup insets_control_changed_item" into main (8760c39a) · Commits · e / os / android_frameworks_base

core/java/android/view/ViewRootImpl.java

+2 −7

Original line number	Diff line number	Diff line
		@@ -130,7 +130,6 @@ import static android.window.flags.DesktopModeFlags.ENABLE_CAPTION_COMPAT_INSET_
		import static com.android.internal.annotations.VisibleForTesting.Visibility.PACKAGE;
		import static com.android.text.flags.Flags.disableHandwritingInitiatorForIme;
		import static com.android.window.flags.Flags.enableBufferTransformHintFromDisplay;
		import static com.android.window.flags.Flags.insetsControlChangedItem;
		import static com.android.window.flags.Flags.insetsControlSeq;
		import static com.android.window.flags.Flags.setScPropertiesInClient;
		import static com.android.window.flags.Flags.systemUiImmersiveConfirmationDialog;
		@@ -11519,12 +11518,8 @@ public final class ViewRootImpl implements ViewParent,
		public void insetsControlChanged(InsetsState insetsState,
		InsetsSourceControl.Array activeControls) {
		final boolean isFromInsetsControlChangeItem;
		if (insetsControlChangedItem()) {
		isFromInsetsControlChangeItem = mIsFromTransactionItem;
		mIsFromTransactionItem = false;
		} else {
		isFromInsetsControlChangeItem = false;
		}
		final ViewRootImpl viewAncestor = mViewAncestor.get();
		if (viewAncestor == null) {
		if (isFromInsetsControlChangeItem) {

+0 −10

Original line number	Diff line number	Diff line
		@@ -66,16 +66,6 @@ flag {
		bug: "293658614"
		}

		flag {
		namespace: "windowing_sdk"
		name: "insets_control_changed_item"
		description: "Pass insetsControlChanged through ClientTransaction to fix the racing"
		bug: "339380439"
		metadata {
		purpose: PURPOSE_BUGFIX
		}
		}

		flag {
		namespace: "windowing_sdk"
		name: "insets_control_seq"

+2 −10

Original line number	Diff line number	Diff line
		@@ -3856,16 +3856,8 @@ class WindowState extends WindowContainer<WindowState> implements WindowManagerP
		}
		fillInsetsState(mLastReportedInsetsState, false /* copySources */);
		fillInsetsSourceControls(mLastReportedActiveControls, false /* copyControls */);
		if (Flags.insetsControlChangedItem()) {
		getProcess().scheduleClientTransactionItem(new WindowStateInsetsControlChangeItem(
		mClient, mLastReportedInsetsState, mLastReportedActiveControls));
		} else {
		try {
		mClient.insetsControlChanged(mLastReportedInsetsState, mLastReportedActiveControls);
		} catch (RemoteException e) {
		Slog.w(TAG, "Failed to deliver inset control state change to w=" + this, e);
		}
		}
		}

		@Override