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

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

Merge changes Ia4b541e0,I128b0cd6 into udc-qpr-dev am: ca5ed17b am: 4d684fc6 

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



Change-Id: I71e55dd3b8fe24eba8830dd39420638f5f2e26b8
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents ed7e260b 4d684fc6

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

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


                @Override

                public void onDetectionStatusChanged(@NonNull FaceDetectionStatus status) {

                    handleFaceAuthenticated(status.getUserId(), status.isStrongBiometric());

                    handleBiometricDetected(status.getUserId(), FACE, status.isStrongBiometric());

                }

            };

packages/SystemUI/src/com/android/systemui/keyguard/data/repository/DeviceEntryFaceAuthRepository.kt

+4 −2
Original line number Diff line number Diff line
@@ -545,11 +545,11 @@ constructor( 
            faceAuthLogger.detectionNotSupported(faceManager, faceManager?.sensorPropertiesInternal)

            return

        }

        if (_isAuthRunning.value || detectCancellationSignal != null) {

        if (_isAuthRunning.value) {

            faceAuthLogger.skippingDetection(_isAuthRunning.value, detectCancellationSignal != null)

            return

        }



        detectCancellationSignal?.cancel()

        detectCancellationSignal = CancellationSignal()

        withContext(mainDispatcher) {

            // We always want to invoke face detect in the main thread.
@@ -574,6 +574,7 @@ constructor( 
        if (authCancellationSignal == null) return



        authCancellationSignal?.cancel()

        cancelNotReceivedHandlerJob?.cancel()

        cancelNotReceivedHandlerJob =

            applicationScope.launch {

                delay(DEFAULT_CANCEL_SIGNAL_TIMEOUT)
@@ -583,6 +584,7 @@ constructor( 
                    cancellationInProgress,

                    faceAuthRequestedWhileCancellation

                )

                _authenticationStatus.value = ErrorFaceAuthenticationStatus.cancelNotReceivedError()

                onFaceAuthRequestCompleted()

            }

        cancellationInProgress = true

packages/SystemUI/src/com/android/systemui/keyguard/shared/model/FaceAuthenticationModels.kt

+19 −4
Original line number Diff line number Diff line
@@ -23,7 +23,10 @@ import android.os.SystemClock.elapsedRealtime 
 * Authentication status provided by

 * [com.android.systemui.keyguard.data.repository.DeviceEntryFaceAuthRepository]

 */

sealed class FaceAuthenticationStatus

sealed class FaceAuthenticationStatus(

    // present to break equality check if the same error occurs repeatedly.

    val createdAt: Long = elapsedRealtime()

)



/** Success authentication status. */

data class SuccessFaceAuthenticationStatus(val successResult: FaceManager.AuthenticationResult) :
@@ -43,8 +46,6 @@ object FailedFaceAuthenticationStatus : FaceAuthenticationStatus() 
data class ErrorFaceAuthenticationStatus(

    val msgId: Int,

    val msg: String? = null,

    // present to break equality check if the same error occurs repeatedly.

    val createdAt: Long = elapsedRealtime()

) : FaceAuthenticationStatus() {

    /**

     * Method that checks if [msgId] is a lockout error. A lockout error means that face
@@ -63,7 +64,21 @@ data class ErrorFaceAuthenticationStatus( 
    fun isHardwareError() =

        msgId == FaceManager.FACE_ERROR_HW_UNAVAILABLE ||

            msgId == FaceManager.FACE_ERROR_UNABLE_TO_PROCESS



    companion object {

        /**

         * Error message that is created when cancel confirmation is not received from FaceManager

         * after we request for a cancellation of face auth.

         */

        fun cancelNotReceivedError() = ErrorFaceAuthenticationStatus(-1, "")

    }

}



/** Face detection success message. */

data class FaceDetectionStatus(val sensorId: Int, val userId: Int, val isStrongBiometric: Boolean)
 
data class FaceDetectionStatus(

    val sensorId: Int,

    val userId: Int,

    val isStrongBiometric: Boolean,

    // present to break equality check if the same error occurs repeatedly.

    val createdAt: Long = elapsedRealtime()

)

packages/SystemUI/tests/src/com/android/systemui/keyguard/data/repository/DeviceEntryFaceAuthRepositoryTest.kt

+28 −1
Original line number Diff line number Diff line
@@ -44,6 +44,7 @@ import com.android.systemui.bouncer.data.repository.FakeKeyguardBouncerRepositor 
import com.android.systemui.bouncer.domain.interactor.AlternateBouncerInteractor

import com.android.systemui.coroutines.FlowValue

import com.android.systemui.coroutines.collectLastValue

import com.android.systemui.coroutines.collectValues

import com.android.systemui.dump.DumpManager

import com.android.systemui.dump.logcatLogBuffer

import com.android.systemui.flags.FakeFeatureFlags
@@ -385,7 +386,10 @@ class DeviceEntryFaceAuthRepositoryTest : SysuiTestCase() { 


            detectionCallback.value.onFaceDetected(1, 1, true)



            assertThat(detectStatus()).isEqualTo(FaceDetectionStatus(1, 1, true))

            val status = detectStatus()!!

            assertThat(status.sensorId).isEqualTo(1)

            assertThat(status.userId).isEqualTo(1)

            assertThat(status.isStrongBiometric).isEqualTo(true)

        }



    @Test
@@ -450,6 +454,29 @@ class DeviceEntryFaceAuthRepositoryTest : SysuiTestCase() { 
            faceAuthenticateIsCalled()

        }



    @Test

    fun multipleCancelCallsShouldNotCauseMultipleCancellationStatusBeingEmitted() =

        testScope.runTest {

            initCollectors()

            allPreconditionsToRunFaceAuthAreTrue()

            val emittedValues by collectValues(underTest.authenticationStatus)



            underTest.authenticate(FACE_AUTH_TRIGGERED_SWIPE_UP_ON_BOUNCER)

            underTest.cancel()

            advanceTimeBy(100)

            underTest.cancel()



            advanceTimeBy(DeviceEntryFaceAuthRepositoryImpl.DEFAULT_CANCEL_SIGNAL_TIMEOUT)

            runCurrent()

            advanceTimeBy(DeviceEntryFaceAuthRepositoryImpl.DEFAULT_CANCEL_SIGNAL_TIMEOUT)

            runCurrent()



            assertThat(emittedValues.size).isEqualTo(1)

            assertThat(emittedValues.first())

                .isInstanceOf(ErrorFaceAuthenticationStatus::class.java)

            assertThat((emittedValues.first() as ErrorFaceAuthenticationStatus).msgId).isEqualTo(-1)

        }



    @Test

    fun faceHelpMessagesAreIgnoredBasedOnConfig() =

        testScope.runTest {