Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Move haptic from authenticated to confirmed (when required).

Browse Source 
Fix: 272832355
Test: atest PromptViewModelTest
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:e072fe34e4dec7b5c5fbaed14fbac7936d45ee56)
Merged-In: I8d9324384680367af7991eab9b5ce42bf378e8bc
Change-Id: I8d9324384680367af7991eab9b5ce42bf378e8bc
This commit is contained in:
Joe Bolinger
2023-07-08 00:04:30 +00:00
committed by Cherrypicker Worker
parent b829ba97bc
commit ee846efe13
2 changed files with 19 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
packages/SystemUI/src/com/android/systemui/biometrics/ui/viewmodel/PromptViewModel.kt
View File

@@ -372,7 +372,9 @@ constructor(
AuthBiometricView.STATE_AUTHENTICATED AuthBiometricView.STATE_AUTHENTICATED
} }
if (!needsUserConfirmation) {
vibrator.success(modality) vibrator.success(modality)
}
messageJob?.cancel() messageJob?.cancel()
messageJob = null messageJob = null
@@ -418,6 +420,8 @@ constructor(
_message.value = PromptMessage.Empty _message.value = PromptMessage.Empty
_legacyState.value = AuthBiometricView.STATE_AUTHENTICATED _legacyState.value = AuthBiometricView.STATE_AUTHENTICATED
vibrator.success(authState.authenticatedModality)
messageJob?.cancel() messageJob?.cancel()
messageJob = null messageJob = null
} }

21
packages/SystemUI/tests/src/com/android/systemui/biometrics/ui/viewmodel/PromptViewModelTest.kt
View File

@@ -49,6 +49,7 @@ import org.junit.runner.RunWith
import org.junit.runners.Parameterized import org.junit.runners.Parameterized
import org.mockito.Mock import org.mockito.Mock
import org.mockito.Mockito.never import org.mockito.Mockito.never
import org.mockito.Mockito.times
import org.mockito.Mockito.verify import org.mockito.Mockito.verify
import org.mockito.junit.MockitoJUnit import org.mockito.junit.MockitoJUnit
@@ -131,18 +132,20 @@ internal class PromptViewModelTest(private val testCase: TestCase) : SysuiTestCa
} }
@Test @Test
fun plays_haptic_on_authenticated() = runGenericTest { fun play_haptic_on_confirm_when_confirmation_required_otherwise_on_authenticated() =
viewModel.showAuthenticated(testCase.authenticatedModality, 1000L) runGenericTest {
val expectConfirmation = testCase.expectConfirmation(atLeastOneFailure = false)
verify(vibrator).vibrateAuthSuccess(any()) viewModel.showAuthenticated(testCase.authenticatedModality, 1_000L)
verify(vibrator, never()).vibrateAuthError(any())
verify(vibrator, if (expectConfirmation) never() else times(1))
.vibrateAuthSuccess(any())
if (expectConfirmation) {
viewModel.confirmAuthenticated()
} }
@Test verify(vibrator).vibrateAuthSuccess(any())
fun plays_no_haptic_on_confirm() = runGenericTest {
viewModel.confirmAuthenticated()
verify(vibrator, never()).vibrateAuthSuccess(any())
verify(vibrator, never()).vibrateAuthError(any()) verify(vibrator, never()).vibrateAuthError(any())
} }