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 am: 60ef9de138

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23103169

Change-Id: I3a76d6da483ab6bd16b05dc3fe3d5d349890b954
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Helen Qin
2023-05-09 17:24:04 +00:00
committed by Automerger Merge Worker
parent cb7f8c1120 60ef9de138
commit fb8f80b3ef
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
import android.app.slice.Slice
import android.app.slice.SliceItem
import android.content.ComponentName
import android.content.Context
import android.content.pm.PackageManager
@@ -336,12 +335,8 @@ class GetFlowUtils {
val structuredAuthEntry =
AuthenticationAction.fromSlice(entry.slice) ?: return@forEach
// TODO: replace with official jetpack code.
val titleItem: SliceItem? = entry.slice.items.firstOrNull {
it.hasHint(
"androidx.credentials.provider.authenticationAction.SLICE_HINT_TITLE")
}
val title: String = titleItem?.text?.toString() ?: providerDisplayName
val title: String =
structuredAuthEntry.title.toString().ifEmpty { providerDisplayName }
result.add(AuthenticationEntryInfo(
providerId = providerId,