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

Commit 093c70d8 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Fix the null toString logic." into udc-dev am: 217d64da 

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



Change-Id: Ib2238da218c788711bf8bf2227c5dd6078ee65b4
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents da0e4af7 217d64da

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

+2 −1
Original line number Original line Diff line number Diff line
@@ -286,7 +286,8 @@ class GetFlowUtils { 
                            pendingIntent = credentialEntry.pendingIntent,

                            pendingIntent = credentialEntry.pendingIntent,

                            fillInIntent = it.frameworkExtrasIntent,

                            fillInIntent = it.frameworkExtrasIntent,

                            credentialType = CredentialType.UNKNOWN,

                            credentialType = CredentialType.UNKNOWN,

                            credentialTypeDisplayName = credentialEntry.typeDisplayName.toString(),

                            credentialTypeDisplayName =

                            credentialEntry.typeDisplayName?.toString().orEmpty(),

                            userName = credentialEntry.title.toString(),

                            userName = credentialEntry.title.toString(),

                            displayName = credentialEntry.subtitle?.toString(),

                            displayName = credentialEntry.subtitle?.toString(),

                            icon = credentialEntry.icon.loadDrawable(context),

                            icon = credentialEntry.icon.loadDrawable(context),