Merge "Cleanup insets_control_seq" into main
diff --git a/core/java/android/view/InsetsController.java b/core/java/android/view/InsetsController.java
index e38281f..8ac5532 100644
--- a/core/java/android/view/InsetsController.java
+++ b/core/java/android/view/InsetsController.java
@@ -29,7 +29,6 @@
import static android.view.WindowInsets.Type.ime;
import static com.android.internal.annotations.VisibleForTesting.Visibility.PACKAGE;
-import static com.android.window.flags.Flags.insetsControlSeq;
import android.animation.Animator;
import android.animation.AnimatorListenerAdapter;
@@ -877,9 +876,7 @@
@InsetsType int visibleTypes = 0;
@InsetsType int[] cancelledUserAnimationTypes = {0};
for (int i = 0, size = newState.sourceSize(); i < size; i++) {
- final InsetsSource source = insetsControlSeq()
- ? new InsetsSource(newState.sourceAt(i))
- : newState.sourceAt(i);
+ final InsetsSource source = new InsetsSource(newState.sourceAt(i));
@InsetsType int type = source.getType();
@AnimationType int animationType = getAnimationType(type);
final InsetsSourceConsumer consumer = mSourceConsumers.get(source.getId());
diff --git a/core/java/android/view/InsetsSourceConsumer.java b/core/java/android/view/InsetsSourceConsumer.java
index 2e2ff1d..da788a7 100644
--- a/core/java/android/view/InsetsSourceConsumer.java
+++ b/core/java/android/view/InsetsSourceConsumer.java
@@ -29,7 +29,6 @@
import static android.view.InsetsSourceConsumerProto.TYPE_NUMBER;
import static com.android.internal.annotations.VisibleForTesting.Visibility.PACKAGE;
-import static com.android.window.flags.Flags.insetsControlSeq;
import android.annotation.IntDef;
import android.annotation.Nullable;
@@ -431,9 +430,6 @@
// Frame is changing while animating. Keep note of the new frame but keep existing frame
// until animation is finished.
- if (!insetsControlSeq()) {
- newSource = new InsetsSource(newSource);
- }
mPendingFrame = new Rect(newSource.getFrame());
mPendingVisibleFrame = newSource.getVisibleFrame() != null
? new Rect(newSource.getVisibleFrame())
diff --git a/core/java/android/view/ViewRootImpl.java b/core/java/android/view/ViewRootImpl.java
index 1cad81b..daa0c57 100644
--- a/core/java/android/view/ViewRootImpl.java
+++ b/core/java/android/view/ViewRootImpl.java
@@ -130,7 +130,6 @@
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.insetsControlSeq;
import static com.android.window.flags.Flags.setScPropertiesInClient;
import static com.android.window.flags.Flags.systemUiImmersiveConfirmationDialog;
@@ -888,10 +887,7 @@
/** Non-{@code null} if {@link #mActivityConfigCallback} is not {@code null}. */
@Nullable
private ActivityWindowInfo mLastReportedActivityWindowInfo;
- @Nullable
- private final ClientWindowFrames mLastReportedFrames = insetsControlSeq()
- ? new ClientWindowFrames()
- : null;
+ private final ClientWindowFrames mLastReportedFrames = new ClientWindowFrames();
private int mLastReportedInsetsStateSeq = getInitSeq();
private int mLastReportedActiveControlsSeq = getInitSeq();
@@ -2316,9 +2312,6 @@
}
private void onClientWindowFramesChanged(@NonNull ClientWindowFrames inOutFrames) {
- if (mLastReportedFrames == null) {
- return;
- }
if (isIncomingSeqStale(mLastReportedFrames.seq, inOutFrames.seq)) {
// If the incoming is stale, use the last reported instead.
inOutFrames.setTo(mLastReportedFrames);
@@ -2329,14 +2322,12 @@
}
private void onInsetsStateChanged(@NonNull InsetsState insetsState) {
- if (insetsControlSeq()) {
- if (isIncomingSeqStale(mLastReportedInsetsStateSeq, insetsState.getSeq())) {
- // The incoming is stale. Skip.
- return;
- }
- // Keep track of the latest.
- mLastReportedInsetsStateSeq = insetsState.getSeq();
+ if (isIncomingSeqStale(mLastReportedInsetsStateSeq, insetsState.getSeq())) {
+ // The incoming is stale. Skip.
+ return;
}
+ // Keep track of the latest.
+ mLastReportedInsetsStateSeq = insetsState.getSeq();
if (mTranslator != null) {
mTranslator.translateInsetsStateInScreenToAppWindow(insetsState);
@@ -2351,15 +2342,13 @@
return;
}
- if (insetsControlSeq()) {
- if (isIncomingSeqStale(mLastReportedActiveControlsSeq, activeControls.getSeq())) {
- // The incoming is stale. Skip.
- activeControls.release();
- return;
- }
- // Keep track of the latest.
- mLastReportedActiveControlsSeq = activeControls.getSeq();
+ if (isIncomingSeqStale(mLastReportedActiveControlsSeq, activeControls.getSeq())) {
+ // The incoming is stale. Skip.
+ activeControls.release();
+ return;
}
+ // Keep track of the latest.
+ mLastReportedActiveControlsSeq = activeControls.getSeq();
final InsetsSourceControl[] controls = activeControls.get();
if (mTranslator != null) {
diff --git a/core/java/android/window/flags/windowing_sdk.aconfig b/core/java/android/window/flags/windowing_sdk.aconfig
index 11d4db3..f0ea7a8 100644
--- a/core/java/android/window/flags/windowing_sdk.aconfig
+++ b/core/java/android/window/flags/windowing_sdk.aconfig
@@ -68,17 +68,6 @@
flag {
namespace: "windowing_sdk"
- name: "insets_control_seq"
- description: "Add seqId to InsetsControls to ensure the stale update is ignored"
- bug: "339380439"
- is_fixed_read_only: true
- metadata {
- purpose: PURPOSE_BUGFIX
- }
-}
-
-flag {
- namespace: "windowing_sdk"
name: "move_animation_options_to_change"
description: "Move AnimationOptions from TransitionInfo to each Change"
bug: "327332488"
diff --git a/core/tests/coretests/src/android/view/ViewRootImplTest.java b/core/tests/coretests/src/android/view/ViewRootImplTest.java
index e240a08..6327211 100644
--- a/core/tests/coretests/src/android/view/ViewRootImplTest.java
+++ b/core/tests/coretests/src/android/view/ViewRootImplTest.java
@@ -71,7 +71,6 @@
import android.hardware.display.DisplayManagerGlobal;
import android.os.Binder;
import android.os.SystemProperties;
-import android.platform.test.annotations.EnableFlags;
import android.platform.test.annotations.Presubmit;
import android.platform.test.annotations.RequiresFlagsEnabled;
import android.platform.test.flag.junit.CheckFlagsRule;
@@ -1599,7 +1598,6 @@
nativeCreateASurfaceControlFromSurface(mViewRootImpl.mSurface));
}
- @EnableFlags(Flags.FLAG_INSETS_CONTROL_SEQ)
@Test
public void testHandleInsetsControlChanged() {
mView = new View(sContext);