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

Merge "Handle empty auth entry title" into udc-dev

Browse Source
This commit is contained in:
Helen Qin
2023-05-09 17:10:09 +00:00
committed by Android (Google) Code Review
parent b6699962a2 e4cdeae925
commit 60ef9de138
1 changed files with 2 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -17,7 +17,6 @@
package com.android.credentialmanager package com.android.credentialmanager
import android.app.slice.Slice import android.app.slice.Slice
import android.app.slice.SliceItem
import android.content.ComponentName import android.content.ComponentName
import android.content.Context import android.content.Context
import android.content.pm.PackageManager import android.content.pm.PackageManager
@@ -336,12 +335,8 @@ class GetFlowUtils {
val structuredAuthEntry = val structuredAuthEntry =
AuthenticationAction.fromSlice(entry.slice) ?: return@forEach AuthenticationAction.fromSlice(entry.slice) ?: return@forEach
// TODO: replace with official jetpack code. val title: String =
val titleItem: SliceItem? = entry.slice.items.firstOrNull { structuredAuthEntry.title.toString().ifEmpty { providerDisplayName }
it.hasHint(
"androidx.credentials.provider.authenticationAction.SLICE_HINT_TITLE")
}
val title: String = titleItem?.text?.toString() ?: providerDisplayName
result.add(AuthenticationEntryInfo( result.add(AuthenticationEntryInfo(
providerId = providerId, providerId = providerId,