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

Commit 27b054f1 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Fix some views not being tracked" into udc-dev am: f0e955ec 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22841498



Change-Id: Iffeec999017bdeec456ef9bc7e40fb7317694dd8
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 6ef266a3 f0e955ec

core/java/android/view/autofill/AutofillManager.java

+7 −5
Original line number Original line Diff line number Diff line
@@ -1464,6 +1464,13 @@ public final class AutofillManager { 
        }

        }





        synchronized (mLock) {

        synchronized (mLock) {

            if (mAllTrackedViews.contains(id)) {

                // The id is tracked and will not trigger pre-fill request again.

                return;

            }



            // Add the id as tracked to avoid triggering fill request again and again.

            mAllTrackedViews.add(id);

            if (mTrackedViews != null) {

            if (mTrackedViews != null) {

                // To support the fill dialog can show for the autofillable Views in

                // To support the fill dialog can show for the autofillable Views in

                // different pages but in the same Activity. We need to reset the

                // different pages but in the same Activity. We need to reset the
@@ -4064,11 +4071,6 @@ public final class AutofillManager { 
        }

        }





        void checkViewState(AutofillId id) {

        void checkViewState(AutofillId id) {

            if (mAllTrackedViews.contains(id)) {

                return;

            }

            // Add the id as tracked to avoid triggering fill request again and again.

            mAllTrackedViews.add(id);

            if (mHasNewTrackedView) {

            if (mHasNewTrackedView) {

                return;

                return;

            }

            }