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

Merge "Clean up the lastUsedTime nullability" into udc-dev

Browse Source
This commit is contained in:
Helen Qin
2023-05-08 17:42:10 +00:00
committed by Android (Google) Code Review
parent ab9ab096e6 5cc03f7a76
commit 9e1f5f9a47
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
packages/CredentialManager/src/com/android/credentialmanager/DataConverter.kt
View File

@@ -661,7 +661,7 @@ class CreateFlowUtils {
passwordCount = createEntry.getPasswordCredentialCount(), passwordCount = createEntry.getPasswordCredentialCount(),
passkeyCount = createEntry.getPublicKeyCredentialCount(), passkeyCount = createEntry.getPublicKeyCredentialCount(),
totalCredentialCount = createEntry.getTotalCredentialCount(), totalCredentialCount = createEntry.getTotalCredentialCount(),
lastUsedTime = createEntry.lastUsedTime, lastUsedTime = createEntry.lastUsedTime ?: Instant.MIN,
footerDescription = createEntry.description?.toString() footerDescription = createEntry.description?.toString()
)) ))
} }

2
packages/CredentialManager/src/com/android/credentialmanager/createflow/CreateModel.kt
View File

@@ -72,7 +72,7 @@ class CreateOptionInfo(
val passwordCount: Int?, val passwordCount: Int?,
val passkeyCount: Int?, val passkeyCount: Int?,
val totalCredentialCount: Int?, val totalCredentialCount: Int?,
val lastUsedTime: Instant?, val lastUsedTime: Instant,
val footerDescription: String?, val footerDescription: String?,
) : BaseEntry( ) : BaseEntry(
providerId, providerId,