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

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

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

Change-Id: Iee6cce3f7e8171ae3dc4f2b405faeeb3c211c60f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Treehugger Robot
2023-05-05 02:32:50 +00:00
committed by Automerger Merge Worker
parent b4275baf1e 217d64daaa
commit 1169acd4ec
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -286,7 +286,8 @@ class GetFlowUtils {
pendingIntent = credentialEntry.pendingIntent,
fillInIntent = it.frameworkExtrasIntent,
credentialType = CredentialType.UNKNOWN,
credentialTypeDisplayName = credentialEntry.typeDisplayName.toString(),
credentialTypeDisplayName =
credentialEntry.typeDisplayName?.toString().orEmpty(),
userName = credentialEntry.title.toString(),
displayName = credentialEntry.subtitle?.toString(),
icon = credentialEntry.icon.loadDrawable(context),