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

Commit 9cd4cf53 authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Fix following crash when last use time is not available" into main

parents 941d2cc9 c46bd04f

packages/CredentialManager/wear/src/com/android/credentialmanager/ui/mappers/CredentialSelectorUiStateGetMapper.kt

+2 −1
Original line number Diff line number Diff line
@@ -22,6 +22,7 @@ import com.android.credentialmanager.CredentialSelectorUiState 
import com.android.credentialmanager.CredentialSelectorUiState.Get.MultipleEntry.PerUserNameEntries

import com.android.credentialmanager.model.CredentialType

import com.android.credentialmanager.model.get.CredentialEntryInfo

import java.time.Instant



fun Request.Get.toGet(isPrimary: Boolean): CredentialSelectorUiState.Get {

    val accounts = providerInfos
@@ -67,4 +68,4 @@ fun Request.Get.toGet(isPrimary: Boolean): CredentialSelectorUiState.Get { 
val comparator = compareBy<CredentialEntryInfo> { entryInfo ->

    // Passkey type always go first

    entryInfo.credentialType.let { if (it == CredentialType.PASSKEY) 0 else 1 }

}.thenByDescending { it.lastUsedTimeMillis ?: 0 }
 
}.thenByDescending { it.lastUsedTimeMillis ?: Instant.EPOCH }