From 8d9ca991973348d490c578f974816a252b3ff383 Mon Sep 17 00:00:00 2001 From: Chandru S Date: Mon, 8 May 2023 23:08:53 -0700 Subject: [PATCH 1/2] Removing very verbose face auth logs from KeyguardUpdateMonitor Fixes: 275097662 Test: NA Change-Id: I06291fafee0e39eaa1ac728c82e5bca37cd9060e --- .../android/keyguard/KeyguardUpdateMonitor.java | 2 -- .../logging/KeyguardUpdateMonitorLogger.kt | 16 ---------------- 2 files changed, 18 deletions(-) diff --git a/packages/SystemUI/src/com/android/keyguard/KeyguardUpdateMonitor.java b/packages/SystemUI/src/com/android/keyguard/KeyguardUpdateMonitor.java index e1707cd08bb88..8f9f967514960 100644 --- a/packages/SystemUI/src/com/android/keyguard/KeyguardUpdateMonitor.java +++ b/packages/SystemUI/src/com/android/keyguard/KeyguardUpdateMonitor.java @@ -1231,7 +1231,6 @@ public class KeyguardUpdateMonitor implements TrustManager.TrustListener, Dumpab */ private void handleFaceAcquired(int acquireInfo) { Assert.isMainThread(); - mLogger.logFaceAcquired(acquireInfo); for (int i = 0; i < mCallbacks.size(); i++) { KeyguardUpdateMonitorCallback cb = mCallbacks.get(i).get(); if (cb != null) { @@ -1284,7 +1283,6 @@ public class KeyguardUpdateMonitor implements TrustManager.TrustListener, Dumpab return; } Assert.isMainThread(); - mLogger.logFaceAuthHelpMsg(msgId, helpString); for (int i = 0; i < mCallbacks.size(); i++) { KeyguardUpdateMonitorCallback cb = mCallbacks.get(i).get(); if (cb != null) { diff --git a/packages/SystemUI/src/com/android/keyguard/logging/KeyguardUpdateMonitorLogger.kt b/packages/SystemUI/src/com/android/keyguard/logging/KeyguardUpdateMonitorLogger.kt index c2d22c3e1d14a..17cc23632d94d 100644 --- a/packages/SystemUI/src/com/android/keyguard/logging/KeyguardUpdateMonitorLogger.kt +++ b/packages/SystemUI/src/com/android/keyguard/logging/KeyguardUpdateMonitorLogger.kt @@ -95,10 +95,6 @@ constructor(@KeyguardUpdateMonitorLog private val logBuffer: LogBuffer) { logBuffer.log(TAG, ERROR, {}, { logMsg }, exception = ex) } - fun logFaceAcquired(acquireInfo: Int) { - logBuffer.log(TAG, DEBUG, { int1 = acquireInfo }, { "Face acquired acquireInfo=$int1" }) - } - fun logFaceAuthDisabledForUser(userId: Int) { logBuffer.log( TAG, @@ -128,18 +124,6 @@ constructor(@KeyguardUpdateMonitorLog private val logBuffer: LogBuffer) { ) } - fun logFaceAuthHelpMsg(msgId: Int, helpMsg: String?) { - logBuffer.log( - TAG, - DEBUG, - { - int1 = msgId - str1 = helpMsg - }, - { "Face help received, msgId: $int1 msg: $str1" } - ) - } - fun logFaceAuthRequested(reason: String?) { logBuffer.log(TAG, DEBUG, { str1 = reason }, { "requestFaceAuth() reason=$str1" }) } From 6bbeb251b2637ff48764fcb4bc06207878b32cdb Mon Sep 17 00:00:00 2001 From: jiewenlei Date: Tue, 9 May 2023 23:31:37 +0000 Subject: [PATCH 2/2] 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);