From e4cdeae9253e0d036b982ee1ae20716c3739a54f Mon Sep 17 00:00:00 2001 From: Helen Qin Date: Tue, 9 May 2023 04:42:12 +0000 Subject: [PATCH] Handle empty auth entry title Use the provider label as title when the title is empty. Test: manual (see bug for screenshots) Bug: 281612710 Fix: 281612710 Change-Id: If8b7a765e331ed1d2c475f21fde7834c960e4b33 --- .../src/com/android/credentialmanager/DataConverter.kt | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/packages/CredentialManager/src/com/android/credentialmanager/DataConverter.kt b/packages/CredentialManager/src/com/android/credentialmanager/DataConverter.kt index 86be1fecb6b0f..70634f435ef19 100644 --- a/packages/CredentialManager/src/com/android/credentialmanager/DataConverter.kt +++ b/packages/CredentialManager/src/com/android/credentialmanager/DataConverter.kt @@ -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,