Merge "Fix coex implicit Bp transitioning to explicit after auth" into main (bd17b255) · Commits · e / os / android_frameworks_base

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

+1 −1

Original line number	Diff line number	Diff line
		@@ -833,7 +833,7 @@ constructor(
		messageJob?.cancel()
		messageJob = null

		if (helpMessage.isNotBlank()) {
		if (helpMessage.isNotBlank() && needsUserConfirmation) {
		showHelp(helpMessage)
		}
		}

+4 −1

Original line number	Diff line number	Diff line
		@@ -503,11 +503,13 @@ internal class PromptViewModelTest(private val testCase: TestCase) : SysuiTestCa
		collectLastValue(kosmos.promptViewModel.iconViewModel.contentDescriptionId)
		val shouldAnimateIconView by
		collectLastValue(kosmos.promptViewModel.iconViewModel.shouldAnimateIconView)
		val message by collectLastValue(kosmos.promptViewModel.message)
		verifyIconSize()

		kosmos.promptViewModel.showAuthenticated(
		modality = testCase.authenticatedModality,
		dismissAfterDelay = DELAY
		dismissAfterDelay = DELAY,
		"TEST"
		)

		if (testCase.isFingerprintOnly) {
		@@ -531,6 +533,7 @@ internal class PromptViewModelTest(private val testCase: TestCase) : SysuiTestCa
		assertThat(iconContentDescriptionId)
		.isEqualTo(R.string.biometric_dialog_face_icon_description_authenticated)
		assertThat(shouldAnimateIconView).isEqualTo(true)
		assertThat(message).isEqualTo(PromptMessage.Empty)
		}
		}
		}