When the origin is empty but not null, app label should be used

Bug: 280902737
Test: manual (see bug for screenshot)
Change-Id: I1edc10ba6887f360e4184bf7a93b8ebb78f0e4c5
This commit is contained in:
Helen Qin
2023-05-05 01:25:44 +00:00
parent 9e6c6ca843
commit 75a4761c8b

View File

@@ -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