commit 296407ceabc582a077e4fbee0626f9132e57235d
author TreeHugger Robot <treehugger-gerrit@google.com> Sat Mar 18 03:04:23 2017 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Sat Mar 18 03:04:27 2017 +0000
tree cac3337e7e79cd55adc376ffae42df300b8eb4e1
parent 5469a7883dbd5477c6e34203f0ea9c5531a01dea
parent d66c84fa1ae6d04b47cbeab5f5cd3240f73780b2

Merge "Removed redundant call to session.removeSelf()"

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

diff --git a/services/autofill/java/com/android/server/autofill/AutofillManagerServiceImpl.java b/services/autofill/java/com/android/server/autofill/AutofillManagerServiceImpl.java
index df76009..e0b7b47 100644
--- a/services/autofill/java/com/android/server/autofill/AutofillManagerServiceImpl.java
+++ b/services/autofill/java/com/android/server/autofill/AutofillManagerServiceImpl.java
@@ -998,7 +998,7 @@
                 mStructure.dump();
             }
 
-            mRemoteFillService.onSaveRequest(mStructure, extras, () -> removeSelf());
+            mRemoteFillService.onSaveRequest(mStructure, extras);
         }
 
         void updateLocked(AutofillId id, Rect bounds, AutofillValue value, int flags) {

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

diff --git a/services/autofill/java/com/android/server/autofill/RemoteFillService.java b/services/autofill/java/com/android/server/autofill/RemoteFillService.java
index d1c8b4f8..299b456 100644
--- a/services/autofill/java/com/android/server/autofill/RemoteFillService.java
+++ b/services/autofill/java/com/android/server/autofill/RemoteFillService.java
@@ -141,10 +141,9 @@
         mHandler.obtainMessageO(MyHandler.MSG_ON_PENDING_REQUEST, request).sendToTarget();
     }
 
-    public void onSaveRequest(@NonNull AssistStructure structure, @Nullable Bundle extras,
-            @Nullable Runnable finalizer) {
+    public void onSaveRequest(@NonNull AssistStructure structure, @Nullable Bundle extras) {
         cancelScheduledUnbind();
-        final PendingSaveRequest request = new PendingSaveRequest(structure, extras, this, finalizer);
+        final PendingSaveRequest request = new PendingSaveRequest(structure, extras, this);
         mHandler.obtainMessageO(MyHandler.MSG_ON_PENDING_REQUEST, request).sendToTarget();
     }
 
@@ -509,14 +508,12 @@
         private final AssistStructure mStructure;
         private final Bundle mExtras;
         private final ISaveCallback mCallback;
-        private final Runnable mFinalizer;
 
         public PendingSaveRequest(@NonNull AssistStructure structure, @Nullable Bundle extras,
-                @NonNull RemoteFillService service, @Nullable Runnable finalizer) {
+                @NonNull RemoteFillService service) {
             mStructure = structure;
             mExtras = extras;
             mWeakService = new WeakReference<>(service);
-            mFinalizer = finalizer;
             mCallback = new ISaveCallback.Stub() {
                 @Override
                 public void onSuccess() {
@@ -548,9 +545,6 @@
                     Slog.e(LOG_TAG, "Error calling on save request", e);
                 }
             }
-            if (mFinalizer != null) {
-              mFinalizer.run();
-            }
         }
 
         @Override