Merge "Request the IME to hide current inline suggestion" into rvc-dev am: 232ffbfe8f am: b778e53b2d am: f2bf1af383 am: 701c9e92c2

Change-Id: Ic4693c8063d21a673fb2ee43cdcec18dabe27503

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

@@ -58,6 +58,7 @@ import com.android.internal.os.IResultReceiver;
 import com.android.server.autofill.ui.InlineSuggestionFactory;
 
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.List;
 import java.util.concurrent.CancellationException;
 import java.util.concurrent.TimeUnit;
@@ -263,6 +264,8 @@ final class RemoteAugmentedAutofillService
                                             && fieldIds.get(0).equals(focusedId);
                                     client.autofill(sessionId, fieldIds, dataset.getFieldValues(),
                                             hideHighlight);
+                                    inlineSuggestionsCallback.apply(new InlineSuggestionsResponse(
+                                            Collections.EMPTY_LIST));
                                 } catch (RemoteException e) {
                                     Slog.w(TAG, "Encounter exception autofilling the values");
                                 }

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

@@ -1228,6 +1228,8 @@ final class Session implements RemoteFillService.FillServiceCallbacks, ViewState
             } catch (RemoteException e) {
                 Slog.e(TAG, "Error requesting to hide fill UI", e);
             }
+
+            mInlineSessionController.hideInlineSuggestionsUiLocked(id);
         }
     }