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

Commit b826525a authored by Chandru's avatar Chandru
Browse files

Remove logging only boolean parameter from KeyguardUpdateMonitor#requestFaceAuth 

This parameter is superseded by the API request reason argument that was added later on

Bug: 238187419
Test: atest KeyguardUpdateMonitorTest
Test: atest NotificationPanelViewControllerTest
Change-Id: I6d63b749bd8973b0d59d007d2b330960a2c6ed68
parent fac53656

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

+1 −1
Original line number Diff line number Diff line
@@ -223,7 +223,7 @@ public class KeyguardSecurityContainerController extends ViewController<Keyguard 
        @Override

        public void onSwipeUp() {

            if (!mUpdateMonitor.isFaceDetectionRunning()) {

                boolean didFaceAuthRun = mUpdateMonitor.requestFaceAuth(true,

                boolean didFaceAuthRun = mUpdateMonitor.requestFaceAuth(

                        FaceAuthApiRequestReason.SWIPE_UP_ON_BOUNCER);

                mKeyguardSecurityCallback.userActivity();

                if (didFaceAuthRun) {

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

+3 −5
Original line number Diff line number Diff line
@@ -1631,7 +1631,7 @@ public class KeyguardUpdateMonitor implements TrustManager.TrustListener, Dumpab 
                @Override

                public void onUdfpsPointerDown(int sensorId) {

                    mLogger.logUdfpsPointerDown(sensorId);

                    requestFaceAuth(true, FaceAuthApiRequestReason.UDFPS_POINTER_DOWN);

                    requestFaceAuth(FaceAuthApiRequestReason.UDFPS_POINTER_DOWN);

                }



                /**
@@ -2372,14 +2372,12 @@ public class KeyguardUpdateMonitor implements TrustManager.TrustListener, Dumpab 
    /**

     * Requests face authentication if we're on a state where it's allowed.

     * This will re-trigger auth in case it fails.

     * @param userInitiatedRequest true if the user explicitly requested face auth

     * @param reason One of the reasons {@link FaceAuthApiRequestReason} on why this API is being

     * invoked.

     * @return current face auth detection state, true if it is running.

     */

    public boolean requestFaceAuth(boolean userInitiatedRequest,

            @FaceAuthApiRequestReason String reason) {

        mLogger.logFaceAuthRequested(userInitiatedRequest, reason);

    public boolean requestFaceAuth(@FaceAuthApiRequestReason String reason) {

        mLogger.logFaceAuthRequested(reason);

        updateFaceListeningState(BIOMETRIC_ACTION_START, apiRequestReasonToUiEvent(reason));

        return isFaceDetectionRunning();

    }

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

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

    }



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

    fun logFaceAuthRequested(reason: String?) {

        logBuffer.log(TAG, DEBUG, {

            bool1 = userInitiatedRequest

            str1 = reason

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

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

    }



    fun logFaceAuthSuccess(userId: Int) {

packages/SystemUI/src/com/android/systemui/biometrics/UdfpsController.java

+1 −3
Original line number Diff line number Diff line
@@ -859,9 +859,7 @@ public class UdfpsController implements DozeReceiver { 
            playStartHaptic();



            if (!mKeyguardUpdateMonitor.isFaceDetectionRunning()) {

                mKeyguardUpdateMonitor.requestFaceAuth(

                        /* userInitiatedRequest */ false,

                        FaceAuthApiRequestReason.UDFPS_POINTER_DOWN);

                mKeyguardUpdateMonitor.requestFaceAuth(FaceAuthApiRequestReason.UDFPS_POINTER_DOWN);

            }

        }

        mOnFingerDown = true;

packages/SystemUI/src/com/android/systemui/shade/NotificationPanelViewController.java

+3 −3
Original line number Diff line number Diff line
@@ -2669,8 +2669,8 @@ public final class NotificationPanelViewController { 


        // When expanding QS, let's authenticate the user if possible,

        // this will speed up notification actions.

        if (height == 0) {

            mCentralSurfaces.requestFaceAuth(false, FaceAuthApiRequestReason.QS_EXPANDED);

        if (height == 0 && !mKeyguardStateController.canDismissLockScreen()) {

            mUpdateMonitor.requestFaceAuth(FaceAuthApiRequestReason.QS_EXPANDED);

        }

    }
@@ -3928,7 +3928,7 @@ public final class NotificationPanelViewController { 
                    mShadeLog.v("onMiddleClicked on Keyguard, mDozingOnDown: false");

                    // Try triggering face auth, this "might" run. Check

                    // KeyguardUpdateMonitor#shouldListenForFace to see when face auth won't run.

                    boolean didFaceAuthRun = mUpdateMonitor.requestFaceAuth(true,

                    boolean didFaceAuthRun = mUpdateMonitor.requestFaceAuth(

                            FaceAuthApiRequestReason.NOTIFICATION_PANEL_CLICKED);



                    if (didFaceAuthRun) {