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

Commit 87923aa8 authored by Adam He's avatar Adam He Committed by Automerger Merge Worker
Browse files

Merge "Add call to send empty suggestions to IME on cancelling augmented... 

Merge "Add call to send empty suggestions to IME on cancelling augmented autofill." into rvc-dev am: 2359a78a am: 159beba8 am: 41abc669

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

Change-Id: Ife6b9a46d2a5db09360d301256b074756f0a30c9
parents 8ba8e935 41abc669

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

+6 −2
Original line number Diff line number Diff line
@@ -2979,8 +2979,8 @@ final class Session implements RemoteFillService.FillServiceCallbacks, ViewState 
                inlineSuggestionsRequest.get(), response, focusedId, filterText,

                /*uiCallback*/this, /*onErrorCallback*/ () -> {

                    synchronized (mLock) {

                        mInlineSessionController.hideInlineSuggestionsUiLocked(

                                focusedId);

                        mInlineSessionController.setInlineFillUiLocked(

                                InlineFillUi.emptyUi(focusedId));

                    }

                }, remoteRenderService);

        return mInlineSessionController.setInlineFillUiLocked(inlineFillUi);
@@ -3284,6 +3284,10 @@ final class Session implements RemoteFillService.FillServiceCallbacks, ViewState 
                                /*onErrorCallback=*/ () -> {

                                    synchronized (mLock) {

                                        cancelAugmentedAutofillLocked();



                                        // Also cancel augmented in IME

                                        mInlineSessionController.setInlineFillUiLocked(

                                                InlineFillUi.emptyUi(mCurrentViewId));

                                    }

                                }, mService.getRemoteInlineSuggestionRenderServiceLocked());

                    }