Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 71995040 authored by Chris Li's avatar Chris Li Committed by Android (Google) Code Review
Browse files

Merge "Fix racing for mIsFromTransactionItem" into main

parents e8c2428c c6924b1c

core/java/android/view/ViewRootImpl.java

+8 −2
Original line number Diff line number Diff line
@@ -126,6 +126,7 @@ import static android.view.inputmethod.InputMethodEditorTraceProto.InputMethodCl 
import static com.android.internal.annotations.VisibleForTesting.Visibility.PACKAGE;

import static com.android.window.flags.Flags.activityWindowInfoFlag;

import static com.android.window.flags.Flags.enableBufferTransformHintFromDisplay;

import static com.android.window.flags.Flags.insetsControlChangedItem;

import static com.android.window.flags.Flags.setScPropertiesInClient;

import static com.android.window.flags.Flags.windowSessionRelayoutInfo;

import static com.android.text.flags.Flags.disableHandwritingInitiatorForIme;
@@ -11429,8 +11430,13 @@ public final class ViewRootImpl implements ViewParent, 
        @Override

        public void insetsControlChanged(InsetsState insetsState,

                InsetsSourceControl.Array activeControls) {

            final boolean isFromInsetsControlChangeItem = mIsFromTransactionItem;

            final boolean isFromInsetsControlChangeItem;

            if (insetsControlChangedItem()) {

                isFromInsetsControlChangeItem = mIsFromTransactionItem;

                mIsFromTransactionItem = false;

            } else {

                isFromInsetsControlChangeItem = false;

            }

            final ViewRootImpl viewAncestor = mViewAncestor.get();

            if (viewAncestor == null) {

                if (isFromInsetsControlChangeItem) {