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

Commit f83937c5 authored by Chandru S's avatar Chandru S Committed by Automerger Merge Worker
Browse files

Merge "Remove duplicate method in KeyguardUpdateMonitor" into tm-qpr-dev am:... 

Merge "Remove duplicate method in KeyguardUpdateMonitor" into tm-qpr-dev am: c40394f1 am: f16ffbb9

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



Change-Id: I633f088884c4e72eed7cde6e88fe602008232489
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents d50e4468 f16ffbb9

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

+0 −4
Original line number Diff line number Diff line
@@ -2365,10 +2365,6 @@ public class KeyguardUpdateMonitor implements TrustManager.TrustListener, Dumpab 
        stopListeningForFace(FACE_AUTH_STOPPED_USER_INPUT_ON_BOUNCER);

    }



    public boolean isFaceScanning() {

        return mFaceRunningState == BIOMETRIC_STATE_RUNNING;

    }



    private void updateFaceListeningState(int action, @NonNull FaceAuthUiEvent faceAuthUiEvent) {

        // If this message exists, we should not authenticate again until this message is

        // consumed by the handler

packages/SystemUI/src/com/android/systemui/FaceScanningOverlay.kt

+1 −1
Original line number Diff line number Diff line
@@ -123,7 +123,7 @@ class FaceScanningOverlay( 
    }



    override fun enableShowProtection(show: Boolean) {

        val showScanningAnimNow = keyguardUpdateMonitor.isFaceScanning && show

        val showScanningAnimNow = keyguardUpdateMonitor.isFaceDetectionRunning && show

        if (showScanningAnimNow == showScanningAnim) {

            return

        }

packages/SystemUI/src/com/android/systemui/decor/FaceScanningProviderFactory.kt

+1 −1
Original line number Diff line number Diff line
@@ -99,7 +99,7 @@ class FaceScanningProviderFactory @Inject constructor( 
    }



    fun shouldShowFaceScanningAnim(): Boolean {

        return canShowFaceScanningAnim() && keyguardUpdateMonitor.isFaceScanning

        return canShowFaceScanningAnim() && keyguardUpdateMonitor.isFaceDetectionRunning

    }

}