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

Commit dafa3207 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Log the ApiRequestReason whenever face auth is requested" into... 

Merge "Log the ApiRequestReason whenever face auth is requested" into tm-qpr-dev am: 2f291a78 am: eff1d1a1

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



Change-Id: I77ccef2b89abc34ce1bca98fa843ade7e9bdfefe
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 163301b4 eff1d1a1

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

+1 −1
Original line number Diff line number Diff line
@@ -2333,7 +2333,7 @@ public class KeyguardUpdateMonitor implements TrustManager.TrustListener, Dumpab 
     */

    public void requestFaceAuth(boolean userInitiatedRequest,

            @FaceAuthApiRequestReason String reason) {

        mLogger.logFaceAuthRequested(userInitiatedRequest);

        mLogger.logFaceAuthRequested(userInitiatedRequest, reason);

        updateFaceListeningState(BIOMETRIC_ACTION_START, apiRequestReasonToUiEvent(reason));

    }

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

+5 −4
Original line number Diff line number Diff line
@@ -108,10 +108,11 @@ class KeyguardUpdateMonitorLogger @Inject constructor( 
                }, { "Face help received, msgId: $int1 msg: $str1" })

    }



    fun logFaceAuthRequested(userInitiatedRequest: Boolean) {

        logBuffer.log(TAG, DEBUG,

                { bool1 = userInitiatedRequest },

                { "requestFaceAuth() userInitiated=$bool1" })

    fun logFaceAuthRequested(userInitiatedRequest: Boolean, reason: String) {

        logBuffer.log(TAG, DEBUG, {

            bool1 = userInitiatedRequest

            str1 = reason

        }, { "requestFaceAuth() userInitiated=$bool1 reason=$str1" })

    }



    fun logFaceAuthSuccess(userId: Int) {

packages/SystemUI/src/com/android/systemui/log/dagger/LogModule.java

+1 −1
Original line number Diff line number Diff line
@@ -322,7 +322,7 @@ public class LogModule { 
    @SysUISingleton

    @KeyguardUpdateMonitorLog

    public static LogBuffer provideKeyguardUpdateMonitorLogBuffer(LogBufferFactory factory) {

        return factory.create("KeyguardUpdateMonitorLog", 200);

        return factory.create("KeyguardUpdateMonitorLog", 400);

    }



    /**