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

Commit 159beba8 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

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

Change-Id: I5657a83c661f20a901e15d2cb2405e24c906e105
parents 3162f432 2359a78a

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

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

                inlineSuggestionsRequest.get(), response, focusedId, filterText,

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

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

                    synchronized (mLock) {

                    synchronized (mLock) {

                        mInlineSessionController.hideInlineSuggestionsUiLocked(

                        mInlineSessionController.setInlineFillUiLocked(

                                focusedId);

                                InlineFillUi.emptyUi(focusedId));

                    }

                    }

                }, remoteRenderService);

                }, remoteRenderService);

        return mInlineSessionController.setInlineFillUiLocked(inlineFillUi);

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

                                /*onErrorCallback=*/ () -> {

                                    synchronized (mLock) {

                                    synchronized (mLock) {

                                        cancelAugmentedAutofillLocked();

                                        cancelAugmentedAutofillLocked();



                                        // Also cancel augmented in IME

                                        mInlineSessionController.setInlineFillUiLocked(

                                                InlineFillUi.emptyUi(mCurrentViewId));

                                    }

                                    }

                                }, mService.getRemoteInlineSuggestionRenderServiceLocked());

                                }, mService.getRemoteInlineSuggestionRenderServiceLocked());

                    }

                    }