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

Commit fbb93031 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: 5a0ed67a 

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



Change-Id: I95f43effd65320334d3e6cc8f9c665289b76dc4f
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents f40722f2 5a0ed67a

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

+1 −1
Original line number Original line Diff line number Diff line
@@ -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()

                ))

                ))

            }

            }

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

+1 −1
Original line number Original line Diff line number Diff line
@@ -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,