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

Merge "When the origin is empty but not null, app label should be used" into udc-dev

Browse Source
This commit is contained in:
Treehugger Robot
2023-05-05 03:44:58 +00:00
committed by Android (Google) Code Review
parent 2c9791ffc3 75a4761c8b
commit 0d4cf06b31
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -213,7 +213,7 @@ class GetFlowUtils {
} }
} }
return com.android.credentialmanager.getflow.RequestDisplayInfo( return com.android.credentialmanager.getflow.RequestDisplayInfo(
appName = originName appName = originName?.ifEmpty { null }
?: getAppLabel(context.packageManager, requestInfo.appPackageName) ?: getAppLabel(context.packageManager, requestInfo.appPackageName)
?: return null, ?: return null,
preferImmediatelyAvailableCredentials = preferImmediatelyAvailableCredentials, preferImmediatelyAvailableCredentials = preferImmediatelyAvailableCredentials,
@@ -462,7 +462,7 @@ class CreateFlowUtils {
if (requestInfo == null) { if (requestInfo == null) {
return null return null
} }
val appLabel = originName val appLabel = originName?.ifEmpty { null }
?: getAppLabel(context.packageManager, requestInfo.appPackageName) ?: getAppLabel(context.packageManager, requestInfo.appPackageName)
?: return null ?: return null
val createCredentialRequest = requestInfo.createCredentialRequest ?: return null val createCredentialRequest = requestInfo.createCredentialRequest ?: return null