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

Commit c2756235 authored by Jerry Wu's avatar Jerry Wu Committed by Android (Google) Code Review
Browse files

Merge "Log UID of Augmented autofill service in AutofillFillRequestReported." into main

parents 9c31450b e8079d20

services/autofill/bugfixes.aconfig

+7 −0
Original line number Diff line number Diff line
@@ -126,3 +126,10 @@ flag { 
    purpose: PURPOSE_BUGFIX

  }

}



flag {

  name: "log_augmented_service_uid"

  namespace: "autofill"

  description: "Log the UID of the augmented autofill service in FillRequest events"

  bug: "411232512"

}

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

+1 −1
Original line number Diff line number Diff line
@@ -1869,7 +1869,7 @@ final class AutofillManagerServiceImpl 
    }



    @GuardedBy("mLock")

    private int getAugmentedAutofillServiceUidLocked() {

    int getAugmentedAutofillServiceUidLocked() {

        if (mRemoteAugmentedAutofillServiceInfo == null) {

            if (mMaster.verbose) {

                Slog.v(TAG, "getAugmentedAutofillServiceUid(): "

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

+11 −1
Original line number Diff line number Diff line
@@ -41,6 +41,7 @@ import static android.service.autofill.FillRequest.FLAG_VIEW_REQUESTS_CREDMAN_SE 
import static android.service.autofill.FillRequest.INVALID_REQUEST_ID;

import static android.service.autofill.Flags.highlightAutofillSingleField;

import static android.service.autofill.Flags.improveFillDialogAconfig;

import static android.service.autofill.Flags.logAugmentedServiceUid;

import static android.service.autofill.Flags.metricsFixes;

import static android.view.autofill.AutofillManager.ACTION_RESPONSE_EXPIRED;

import static android.view.autofill.AutofillManager.ACTION_START_SESSION;
@@ -1501,7 +1502,12 @@ final class Session 
            mSessionFlags.mAugmentedAutofillOnly = true;

            mFillRequestEventLogger.maybeSetRequestId(AUGMENTED_AUTOFILL_REQUEST_ID);

            mFillRequestEventLogger.maybeSetIsAugmented(true);

            if (logAugmentedServiceUid()) {

                mFillRequestEventLogger.maybeSetAutofillServiceUid(

                    mService.getAugmentedAutofillServiceUidLocked());

            } else {

                mFillRequestEventLogger.logAndEndEvent();

            }

            triggerAugmentedAutofillLocked(flags);

            return Optional.empty();

        }
@@ -6517,6 +6523,10 @@ final class Session 
        mFillRequestEventLogger.maybeSetFlags(mFlags);

        mFillRequestEventLogger.maybeSetRequestId(AUGMENTED_AUTOFILL_REQUEST_ID);

        mFillRequestEventLogger.maybeSetIsAugmented(true);

        if (logAugmentedServiceUid()) {

            mFillRequestEventLogger.maybeSetAutofillServiceUid(

                    mService.getAugmentedAutofillServiceUidLocked());

        }

        mFillRequestEventLogger.logAndEndEvent();



        final ViewState viewState = mViewStates.get(mCurrentViewId);