Merge "Don't log TYPE_DATASET_SELECTED on dataset authentication." into oc-mr1-dev

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

diff --cc services/autofill/java/com/android/server/autofill/Session.java
index c684a42,b711293..e0e379f
--- 1/services/autofill/java/com/android/server/autofill/Session.java
--- 2/services/autofill/java/com/android/server/autofill/Session.java
+++ b/services/autofill/java/com/android/server/autofill/Session.java
@@@ -747,14 -756,8 +747,14 @@@ final class Session implements RemoteFi
              if (datasetIdx != AutofillManager.AUTHENTICATION_ID_DATASET_ID_UNDEFINED) {
                  final Dataset dataset = (Dataset) result;
                  authenticatedResponse.getDatasets().set(datasetIdx, dataset);
-                 autoFill(requestId, datasetIdx, dataset);
+                 autoFill(requestId, datasetIdx, dataset, false);
              }
 +        } else {
 +            if (result != null) {
 +                Slog.w(TAG, "service returned invalid auth type: " + result);
 +            }
 +            // TODO: add proper metric (on else)
 +            processNullResponseLocked(0);
          }
      }
  
@@@ -967,11 -970,11 +967,11 @@@
                  }
  
                  if (sDebug) Slog.d(TAG, "Good news, everyone! All checks passed, show save UI!");
-                 mService.setSaveShown(id);
+                 mService.logSaveShown(id);
                  final IAutoFillManagerClient client = getClient();
 -                mPendingSaveUi = new PendingUi(mActivityToken);
 +                mPendingSaveUi = new PendingUi(mActivityToken, id, client);
                  getUiForShowing().showSaveUi(mService.getServiceLabel(), saveInfo,
 -                        valueFinder, mPackageName, this, mPendingSaveUi, id, client);
 +                        valueFinder, mPackageName, this, mPendingSaveUi);
                  if (client != null) {
                      try {
                          client.setSaveUiState(id, true);
@@@ -1552,9 -1541,10 +1554,9 @@@
              }
  
              // ...or handle authentication.
-             mService.setDatasetAuthenticationSelected(dataset.getId(), id);
+             mService.logDatasetAuthenticationSelected(dataset.getId(), id);
              setViewStatesLocked(null, dataset, ViewState.STATE_WAITING_DATASET_AUTH, false);
 -            final Intent fillInIntent = createAuthFillInIntent(
 -                    getFillContextByRequestIdLocked(requestId).getStructure(), mClientState);
 +            final Intent fillInIntent = createAuthFillInIntentLocked(requestId, mClientState);
  
              final int authenticationId = AutofillManager.makeAuthenticationId(requestId,
                      datasetIndex);