From 6bbeb251b2637ff48764fcb4bc06207878b32cdb Mon Sep 17 00:00:00 2001 From: jiewenlei Date: Tue, 9 May 2023 23:31:37 +0000 Subject: [PATCH] Fix discovered logging issues for Autofill. Test: m Bug: 278920289 Change-Id: I951b336d3bd21e2383bda532b7c7b00150aa5827 --- .../com/android/server/autofill/FillRequestEventLogger.java | 3 --- .../autofill/java/com/android/server/autofill/Session.java | 3 ++- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/services/autofill/java/com/android/server/autofill/FillRequestEventLogger.java b/services/autofill/java/com/android/server/autofill/FillRequestEventLogger.java index 06a616c3f3487..994802d928f10 100644 --- a/services/autofill/java/com/android/server/autofill/FillRequestEventLogger.java +++ b/services/autofill/java/com/android/server/autofill/FillRequestEventLogger.java @@ -74,9 +74,6 @@ public final class FillRequestEventLogger { public static final int TRIGGER_REASON_SERVED_FROM_CACHED_RESPONSE = AUTOFILL_FILL_REQUEST_REPORTED__REQUEST_TRIGGER_REASON__TRIGGER_REASON_SERVED_FROM_CACHED_RESPONSE; - // Augmented autofill currently doesn't have an assigned request_id, use -2 as the magic number. - public static final int AUGMENTED_AUTOFILL_REQUEST_ID = -2; - private final int mSessionId; private Optional mEventInternal; diff --git a/services/autofill/java/com/android/server/autofill/Session.java b/services/autofill/java/com/android/server/autofill/Session.java index 311300043b1b7..78a5104541c4b 100644 --- a/services/autofill/java/com/android/server/autofill/Session.java +++ b/services/autofill/java/com/android/server/autofill/Session.java @@ -1158,7 +1158,7 @@ final class Session implements RemoteFillService.FillServiceCallbacks, ViewState } mSessionFlags.mAugmentedAutofillOnly = true; mFillRequestEventLogger.maybeSetRequestId(AUGMENTED_AUTOFILL_REQUEST_ID); - mFillRequestEventLogger.maybeSetIsAugmented(mSessionFlags.mAugmentedAutofillOnly); + mFillRequestEventLogger.maybeSetIsAugmented(true); mFillRequestEventLogger.logAndEndEvent(); triggerAugmentedAutofillLocked(flags); return; @@ -4812,6 +4812,7 @@ final class Session implements RemoteFillService.FillServiceCallbacks, ViewState mFillRequestEventLogger.maybeSetAppPackageUid(uid); mFillRequestEventLogger.maybeSetFlags(mFlags); mFillRequestEventLogger.maybeSetRequestId(AUGMENTED_AUTOFILL_REQUEST_ID); + mFillRequestEventLogger.maybeSetIsAugmented(true); mFillRequestEventLogger.logAndEndEvent(); final ViewState viewState = mViewStates.get(mCurrentViewId);