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

Commit d84fa40f authored by Simranjit Kohli's avatar Simranjit Kohli Committed by Automerger Merge Worker
Browse files

Merge "[Autofill PCC] Fix crash on picking result from Fill Dialog Note that... 

Merge "[Autofill PCC] Fix crash on picking result from Fill Dialog Note that these are band-aid fixes, and proper fixes would come later. Also, guard an existing call behind the flag. Bug: 275608129 Test: Manually tested twitter app" into udc-dev am: 646c4e0f am: 15ea9e9a

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



Change-Id: I227568f00a76e0730c623a84f39c9a5776d64960
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents b76859b0 15ea9e9a

core/java/android/service/autofill/FillContext.java

+1 −1
Original line number Diff line number Diff line
@@ -127,7 +127,7 @@ public final class FillContext implements Parcelable { 
                final int index = missingNodeIndexes.keyAt(i);

                final AutofillId id = ids[index];



                if (id.equals(node.getAutofillId())) {

                if (id != null && id.equals(node.getAutofillId())) {

                    foundNodes[index] = node;



                    if (mViewNodeLookupTable == null) {

core/java/android/view/autofill/AutofillClientController.java

+6 −1
Original line number Diff line number Diff line
@@ -350,6 +350,10 @@ public final class AutofillClientController implements AutofillManager.AutofillC 
        final boolean[] visible = new boolean[autofillIdCount];

        for (int i = 0; i < autofillIdCount; i++) {

            final AutofillId autofillId = autofillIds[i];

            if (autofillId == null) {

                visible[i] = false;

                continue;

            }

            final View view = autofillClientFindViewByAutofillIdTraversal(autofillId);

            if (view != null) {

                if (!autofillId.isVirtualInt()) {
@@ -383,6 +387,7 @@ public final class AutofillClientController implements AutofillManager.AutofillC 


    @Override

    public View autofillClientFindViewByAutofillIdTraversal(AutofillId autofillId) {

        if (autofillId == null) return null;

        final ArrayList<ViewRootImpl> roots =

                WindowManagerGlobal.getInstance().getRootViews(mActivity.getActivityToken());

        for (int rootNum = 0; rootNum < roots.size(); rootNum++) {
@@ -410,7 +415,7 @@ public final class AutofillClientController implements AutofillManager.AutofillC 
            if (rootView != null) {

                final int viewCount = autofillIds.length;

                for (int viewNum = 0; viewNum < viewCount; viewNum++) {

                    if (views[viewNum] == null) {

                    if (autofillIds[viewNum] != null && views[viewNum] == null) {

                        views[viewNum] = rootView.findViewByAutofillIdTraversal(

                                autofillIds[viewNum].getViewId());

                    }

services/autofill/java/com/android/server/autofill/Session.java

+2 −1
Original line number Diff line number Diff line
@@ -1176,7 +1176,8 @@ final class Session implements RemoteFillService.FillServiceCallbacks, ViewState 
        // structure is taken. This causes only one fill request per burst of focus changes.

        cancelCurrentRequestLocked();



        if (mClassificationState.mHintsToAutofillIdMap == null) {

        if (mService.getMaster().isPccClassificationEnabled()

                && mClassificationState.mHintsToAutofillIdMap == null) {

            if (sVerbose) {

                Slog.v(TAG, "triggering field classification");

            }