From d2786a80ca38489b4fcbb59ad4f7b2f104a10893 Mon Sep 17 00:00:00 2001
From: Helen Qin <helenqin@google.com>
Date: Fri, 5 May 2023 00:21:30 +0000
Subject: Fix the null toString logic.

Test: manual (see bug for screenshot)
Bug: 280896321
Change-Id: Ied05c43a09d6a2086dc60d7c9d5cb1d35a8bba91
---
 .../src/com/android/credentialmanager/DataConverter.kt                 | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/packages/CredentialManager/src/com/android/credentialmanager/DataConverter.kt b/packages/CredentialManager/src/com/android/credentialmanager/DataConverter.kt
index a35310cdad95..fcf8c6cd85d9 100644
--- a/packages/CredentialManager/src/com/android/credentialmanager/DataConverter.kt
+++ b/packages/CredentialManager/src/com/android/credentialmanager/DataConverter.kt
@@ -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),
-- 
cgit v1.2.3-59-g8ed1b