From 5b2ca0e0ad4be4d8070c51c8924fee05af9c813a Mon Sep 17 00:00:00 2001
From: Felipe Leme <felipeal@google.com>
Date: Wed, 15 Feb 2017 18:17:12 -0800
Subject: [PATCH] Pass FillResponse extra back to onSaveRequest(...).

BUG: 33197203
Test: CtsAutoFillServiceTestCases passes
Change-Id: Ibb57b07c7287527acc4c92607de044e789f09dcc
---
 .../autofill/AutoFillManagerServiceImpl.java  | 24 +------------------
 .../server/autofill/RemoteFillService.java    |  2 +-
 2 files changed, 2 insertions(+), 24 deletions(-)

diff --git a/services/autofill/java/com/android/server/autofill/AutoFillManagerServiceImpl.java b/services/autofill/java/com/android/server/autofill/AutoFillManagerServiceImpl.java
index 85bf5c260b7b3..a697a8ee5c4ac 100644
--- a/services/autofill/java/com/android/server/autofill/AutoFillManagerServiceImpl.java
+++ b/services/autofill/java/com/android/server/autofill/AutoFillManagerServiceImpl.java
@@ -737,29 +737,7 @@ final class AutoFillManagerServiceImpl {
         private void callSaveLocked() {
             if (DEBUG) Slog.d(TAG, "callSaveLocked(): mViewStates=" + mViewStates);
 
-            // TODO(b/33197203): hookup extras and make sure they're tested by CTS
-            final Bundle extras = null;
-//            // TODO(b/33197203): make sure the extras are tested by CTS
-//            final Bundle responseExtras = mCurrentResponse == null ? null
-//                    : mCurrentResponse.getExtras();
-//            final Bundle datasetExtras = mAutoFilledDataset == null ? null
-//                    : mAutoFilledDataset.getExtras();
-//            final Bundle extras = (responseExtras == null && datasetExtras == null)
-//                    ? null : new Bundle();
-//            if (responseExtras != null) {
-//                if (DEBUG) {
-//                    Slog.d(TAG, "response extras on save extras: "
-//                            + bundleToString(responseExtras));
-//                }
-//                extras.putBundle(AutoFillService.EXTRA_RESPONSE_EXTRAS, responseExtras);
-//            }
-//            if (datasetExtras != null) {
-//                if (DEBUG) {
-//                    Slog.d(TAG, "dataset extras on save extras: " + bundleToString(datasetExtras));
-//                }
-//                extras.putBundle(AutoFillService.EXTRA_DATASET_EXTRAS, datasetExtras);
-//            }
-
+            final Bundle extras = this.mCurrentResponse.getExtras();
 
             for (Entry<AutoFillId, ViewState> entry : mViewStates.entrySet()) {
                 final AutoFillValue value = entry.getValue().mAutoFillValue;
diff --git a/services/autofill/java/com/android/server/autofill/RemoteFillService.java b/services/autofill/java/com/android/server/autofill/RemoteFillService.java
index 767fb4619a436..6502e7fa43f9b 100644
--- a/services/autofill/java/com/android/server/autofill/RemoteFillService.java
+++ b/services/autofill/java/com/android/server/autofill/RemoteFillService.java
@@ -191,7 +191,7 @@ final class RemoteFillService implements DeathRecipient {
             ensureBound();
         } else {
             if (DEBUG) {
-                Slog.d(LOG_TAG, "[user: " + mUserId + "] handleOnFillRequest()");
+                Slog.d(LOG_TAG, "[user: " + mUserId + "] handlePendingRequest()");
             }
             pendingRequest.run();
         }