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

Commit 41abc669 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

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

Change-Id: I92812265d117642b89c81d8c7185d6a58d82a664
parents 4a053246 159beba8

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());

                    }