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

Commit 01b99d92 authored by Haoran Zhang's avatar Haoran Zhang Committed by Android (Google) Code Review
Browse files

Merge "[Autofill Framework] Add in null check before further processing inline... 

Merge "[Autofill Framework] Add in null check before further processing inline request for augmented." into main
parents bf27401a eeb48a53

services/autofill/bugfixes.aconfig

+10 −0
Original line number Diff line number Diff line
@@ -143,3 +143,13 @@ flag { 
    purpose: PURPOSE_BUGFIX

  }

}



flag {

  name: "add_null_check_for_augmented_inline_request"

  namespace: "autofill"

  description: "Add null check for augmented inline request"

  bug: "427159531"

  metadata {

    purpose: PURPOSE_BUGFIX

  }

}

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

+7 −0
Original line number Diff line number Diff line
@@ -6717,6 +6717,13 @@ final class Session 
        synchronized (mLock) {

            final RemoteAugmentedAutofillService remoteService =

                    mService.getRemoteAugmentedAutofillServiceLocked();

            if (Flags.addNullCheckForAugmentedInlineRequest() && remoteService == null) {

                Slog.i(

                        TAG,

                        "onAugmentedAutofillInlineSuggestionAccept(): no service for user, skipping"

                                + " processing inline suggestion request");

                return;

            }

            logAugmentedAutofillRequestLocked(

                    mode,

                    remoteService.getComponentName(),