diff options
| -rw-r--r-- | core/java/android/view/ViewRootImpl.java | 9 | ||||
| -rw-r--r-- | core/java/android/window/flags/windowing_sdk.aconfig | 10 | ||||
| -rw-r--r-- | services/core/java/com/android/server/wm/WindowState.java | 12 |
3 files changed, 4 insertions, 27 deletions
diff --git a/core/java/android/view/ViewRootImpl.java b/core/java/android/view/ViewRootImpl.java index d46e1f29597e..1cad81b3e030 100644 --- a/core/java/android/view/ViewRootImpl.java +++ b/core/java/android/view/ViewRootImpl.java @@ -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; - } + isFromInsetsControlChangeItem = mIsFromTransactionItem; + mIsFromTransactionItem = false; final ViewRootImpl viewAncestor = mViewAncestor.get(); if (viewAncestor == null) { if (isFromInsetsControlChangeItem) { diff --git a/core/java/android/window/flags/windowing_sdk.aconfig b/core/java/android/window/flags/windowing_sdk.aconfig index 9ae3fc1fa3f0..11d4db3394e4 100644 --- a/core/java/android/window/flags/windowing_sdk.aconfig +++ b/core/java/android/window/flags/windowing_sdk.aconfig @@ -68,16 +68,6 @@ flag { 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" description: "Add seqId to InsetsControls to ensure the stale update is ignored" bug: "339380439" diff --git a/services/core/java/com/android/server/wm/WindowState.java b/services/core/java/com/android/server/wm/WindowState.java index 1640ad3f1958..4c4b4f65edf5 100644 --- a/services/core/java/com/android/server/wm/WindowState.java +++ b/services/core/java/com/android/server/wm/WindowState.java @@ -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); - } - } + getProcess().scheduleClientTransactionItem(new WindowStateInsetsControlChangeItem( + mClient, mLastReportedInsetsState, mLastReportedActiveControls)); } @Override |