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

Commit 4a4456a6 authored by Helen Qin's avatar Helen Qin Committed by Automerger Merge Worker
Browse files

Merge "Clean up the lastUsedTime nullability" into udc-dev am: 9e1f5f9a am:... 

Merge "Clean up the lastUsedTime nullability" into udc-dev am: 9e1f5f9a am: f0305b58 am: e66c806b

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23078401



Change-Id: If00b0fd06d814a5670fb00dc75c892acba476dc2
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 2eed692a e66c806b

packages/CredentialManager/src/com/android/credentialmanager/DataConverter.kt

+1 −1
Original line number Diff line number Diff line
@@ -661,7 +661,7 @@ class CreateFlowUtils { 
                    passwordCount = createEntry.getPasswordCredentialCount(),

                    passkeyCount = createEntry.getPublicKeyCredentialCount(),

                    totalCredentialCount = createEntry.getTotalCredentialCount(),

                    lastUsedTime = createEntry.lastUsedTime,

                    lastUsedTime = createEntry.lastUsedTime ?: Instant.MIN,

                    footerDescription = createEntry.description?.toString()

                ))

            }

packages/CredentialManager/src/com/android/credentialmanager/createflow/CreateModel.kt

+1 −1
Original line number Diff line number Diff line
@@ -72,7 +72,7 @@ class CreateOptionInfo( 
    val passwordCount: Int?,

    val passkeyCount: Int?,

    val totalCredentialCount: Int?,

    val lastUsedTime: Instant?,

    val lastUsedTime: Instant,

    val footerDescription: String?,

) : BaseEntry(

    providerId,