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

Commit 1d6b6cef authored by Joshua Mccloskey's avatar Joshua Mccloskey Committed by Android (Google) Code Review
Browse files

Merge "Added error message to error state." into main

parents efb5fa50 d9c83e35

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()