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

Commit 0b669968 authored by Tim Yu's avatar Tim Yu
Browse files

Autofill Fix FillResponse trigger reason 

Add cases for
t.metric_array.metric.event.autofill.event_autofill_fill_request_reported.atom.request_trigger_reason:

1. TRIGGER_REASON_EXPLICITLY_REQUESTED (user/app request autofill)
2. TRIGGER_REASON_RETRIGGER (autofill provider trigger autofill)

Test: locally verify logs
Fixes: 326516787
Change-Id: Icdd9c06ced90365d87fa010faa8d6c193fcc8601
parent 2fc94acf

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

+11 −1
Original line number Diff line number Diff line
@@ -53,8 +53,10 @@ import static android.view.autofill.AutofillManager.FLAG_SMART_SUGGESTION_SYSTEM 
import static android.view.autofill.AutofillManager.getSmartSuggestionModeToString;



import static com.android.internal.util.function.pooled.PooledLambda.obtainMessage;

import static com.android.server.autofill.FillRequestEventLogger.TRIGGER_REASON_EXPLICITLY_REQUESTED;

import static com.android.server.autofill.FillRequestEventLogger.TRIGGER_REASON_NORMAL_TRIGGER;

import static com.android.server.autofill.FillRequestEventLogger.TRIGGER_REASON_PRE_TRIGGER;

import static com.android.server.autofill.FillRequestEventLogger.TRIGGER_REASON_RETRIGGER;

import static com.android.server.autofill.FillRequestEventLogger.TRIGGER_REASON_SERVED_FROM_CACHED_RESPONSE;

import static com.android.server.autofill.FillResponseEventLogger.AVAILABLE_COUNT_WHEN_FILL_REQUEST_FAILED_OR_TIMEOUT;

import static com.android.server.autofill.FillResponseEventLogger.DETECTION_PREFER_AUTOFILL_PROVIDER;
@@ -543,6 +545,8 @@ final class Session implements RemoteFillService.FillServiceCallbacks, ViewState 
                    synchronized (mLock) {

                        int requestId = intent.getIntExtra(EXTRA_REQUEST_ID, 0);

                        FillResponse response = intent.getParcelableExtra(EXTRA_FILL_RESPONSE, android.service.autofill.FillResponse.class);

                        mFillRequestEventLogger.maybeSetRequestTriggerReason(

                                TRIGGER_REASON_RETRIGGER);

                        mAssistReceiver.processDelayedFillLocked(requestId, response);

                    }

                }
@@ -1268,7 +1272,13 @@ final class Session implements RemoteFillService.FillServiceCallbacks, ViewState 
        if(mPreviouslyFillDialogPotentiallyStarted) {

            mFillRequestEventLogger.maybeSetRequestTriggerReason(TRIGGER_REASON_PRE_TRIGGER);

        } else {

            mFillRequestEventLogger.maybeSetRequestTriggerReason(TRIGGER_REASON_NORMAL_TRIGGER);

            if ((flags & FLAG_MANUAL_REQUEST) != 0) {

                mFillRequestEventLogger.maybeSetRequestTriggerReason(

                        TRIGGER_REASON_EXPLICITLY_REQUESTED);

            } else {

                mFillRequestEventLogger.maybeSetRequestTriggerReason(

                        TRIGGER_REASON_NORMAL_TRIGGER);

            }

        }

        if (existingResponse != null) {

            setViewStatesLocked(