From 75a4761c8b5697932990a319cad4c6c67dcdc7dd Mon Sep 17 00:00:00 2001
From: Helen Qin <helenqin@google.com>
Date: Fri, 5 May 2023 01:25:44 +0000
Subject: [PATCH] When the origin is empty but not null, app label should be
 used

Bug: 280902737
Test: manual (see bug for screenshot)
Change-Id: I1edc10ba6887f360e4184bf7a93b8ebb78f0e4c5
---
 .../src/com/android/credentialmanager/DataConverter.kt        | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/CredentialManager/src/com/android/credentialmanager/DataConverter.kt b/packages/CredentialManager/src/com/android/credentialmanager/DataConverter.kt
index a35310cdad954..b1f8990d11c33 100644
--- a/packages/CredentialManager/src/com/android/credentialmanager/DataConverter.kt
+++ b/packages/CredentialManager/src/com/android/credentialmanager/DataConverter.kt
@@ -213,7 +213,7 @@ class GetFlowUtils {
                     }
                 }
             return com.android.credentialmanager.getflow.RequestDisplayInfo(
-                appName = originName
+                appName = originName?.ifEmpty { null }
                     ?: getAppLabel(context.packageManager, requestInfo.appPackageName)
                     ?: return null,
                 preferImmediatelyAvailableCredentials = preferImmediatelyAvailableCredentials,
@@ -461,7 +461,7 @@ class CreateFlowUtils {
             if (requestInfo == null) {
                 return null
             }
-            val appLabel = originName
+            val appLabel = originName?.ifEmpty { null }
                 ?: getAppLabel(context.packageManager, requestInfo.appPackageName)
                 ?: return null
             val createCredentialRequest = requestInfo.createCredentialRequest ?: return null