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

Commit d9c83e35 authored by Joshua McCloskey's avatar Joshua McCloskey Committed by Joshua Mccloskey
Browse files

Added error message to error state. 

This allows for further customization of string error messages when
needed.
Bug: 365565482
Flag: EXEMPT not needed
Test: manual

Change-Id: I57d6e7b09530bd810518e4154001140c5debfd6c
parent cb6b37e6

src/com/android/settings/biometrics/fingerprint2/conversion/Util.kt

+1 −0
Original line number Diff line number Diff line
@@ -67,6 +67,7 @@ object Util { 
    return FingerEnrollState.EnrollError(

      errTitle,

      errString,

      this,

      this == FINGERPRINT_ERROR_UNABLE_TO_PROCESS,

      this == FINGERPRINT_ERROR_CANCELED,

    )

src/com/android/settings/biometrics/fingerprint2/lib/model/FingerEnrollState.kt

+4 −1
Original line number Diff line number Diff line
@@ -35,10 +35,13 @@ sealed class FingerEnrollState { 
  data class EnrollHelp(@StringRes val helpMsgId: Int, val helpString: String) :

    FingerEnrollState()



  /** Represents that an unrecoverable error has been encountered and the operation is complete. */

  /** Represents that an unrecoverable error has been encountered and the operation is complete.

   * Note that errorId is the raw error id from [FingerprintManager]

   */

  data class EnrollError(

    @StringRes val errTitle: Int,

    @StringRes val errString: Int,

    val errorId: Int,

    val shouldRetryEnrollment: Boolean,

    val isCancelled: Boolean,

  ) : FingerEnrollState()