Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5b2ca0e0 authored by Felipe Leme's avatar Felipe Leme
Browse files

Pass FillResponse extra back to onSaveRequest(...). 

BUG: 33197203
Test: CtsAutoFillServiceTestCases passes
Change-Id: Ibb57b07c7287527acc4c92607de044e789f09dcc
parent c3c62b30

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

+1 −23
Original line number Diff line number Diff line
@@ -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;

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

+1 −1
Original line number Diff line number Diff line
@@ -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();

        }