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

Commit c20a1829 authored by Jiewen Lei's avatar Jiewen Lei Committed by Automerger Merge Worker
Browse files

Merge "Fix discovered logging issues for Autofill." into udc-dev am: 691b6c29 am: 67febbd5 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23123667



Change-Id: I5b471dd31a0847d5066f8e6bb7d92253efe964f8
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents e81f8f1c 67febbd5

packages/SystemUI/src/com/android/keyguard/KeyguardUpdateMonitor.java

+0 −2
Original line number Diff line number Diff line
@@ -1235,7 +1235,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) {
@@ -1288,7 +1287,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) {

packages/SystemUI/src/com/android/keyguard/logging/KeyguardUpdateMonitorLogger.kt

+0 −16
Original line number Diff line number Diff line
@@ -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" })

    }

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

+0 −3
Original line number Diff line number Diff line
@@ -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<FillRequestEventInternal> mEventInternal;

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

+2 −1
Original line number Diff line number Diff line
@@ -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;
@@ -4818,6 +4818,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);