Merge "Remove AutofillManagerClient after AutofillManager is finalized" am: dd5384a4f...

am: bb4a13b097

Change-Id: I5f3eea81f662d0396b7fd384b2e91c2087f41c0f

diff --cc core/java/android/view/autofill/AutofillManager.java
index a56f86d,03bd4ed..9241ec0
--- 1/core/java/android/view/autofill/AutofillManager.java
--- 2/core/java/android/view/autofill/AutofillManager.java
+++ b/core/java/android/view/autofill/AutofillManager.java
@@@ -1291,13 -1202,15 +1306,17 @@@ public final class AutofillManager 
                  // Reset the session state
                  resetSessionLocked();
              }
 -            if (resetClient) {
 +            if ((flags & SET_STATE_FLAG_RESET_CLIENT) != 0) {
                  // Reset connection to system
                  mServiceClient = null;
+                 if (mServiceClientCleaner != null) {
+                     mServiceClientCleaner.clean();
+                     mServiceClientCleaner = null;
+                 }
              }
          }
 +        sDebug = (flags & SET_STATE_FLAG_DEBUG) != 0;
 +        sVerbose = (flags & SET_STATE_FLAG_VERBOSE) != 0;
      }
  
      /**

diff --cc core/java/android/view/autofill/IAutoFillManager.aidl
index 9329c4d,5e53896..d6db3fe
--- 1/core/java/android/view/autofill/IAutoFillManager.aidl
--- 2/core/java/android/view/autofill/IAutoFillManager.aidl
+++ b/core/java/android/view/autofill/IAutoFillManager.aidl
@@@ -33,9 -32,10 +33,10 @@@ import android.view.autofill.IAutoFillM
  interface IAutoFillManager {
      // Returns flags: FLAG_ADD_CLIENT_ENABLED | FLAG_ADD_CLIENT_DEBUG | FLAG_ADD_CLIENT_VERBOSE
      int addClient(in IAutoFillManagerClient client, int userId);
+     void removeClient(in IAutoFillManagerClient client, int userId);
      int startSession(IBinder activityToken, in IBinder appCallback, in AutofillId autoFillId,
              in Rect bounds, in AutofillValue value, int userId, boolean hasCallback, int flags,
 -            String packageName);
 +            in ComponentName componentName);
      FillEventHistory getFillEventHistory();
      boolean restoreSession(int sessionId, in IBinder activityToken, in IBinder appCallback);
      void updateSession(int sessionId, in AutofillId id, in Rect bounds,

diff --cc services/autofill/java/com/android/server/autofill/AutofillManagerService.java
Simple merge

diff --cc services/autofill/java/com/android/server/autofill/AutofillManagerServiceImpl.java
Simple merge