Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f1f29846 authored by Helen Qin's avatar Helen Qin Committed by Automerger Merge Worker
Browse files

Merge "Handle empty auth entry title" into udc-dev am: 60ef9de1 am:... 

Merge "Handle empty auth entry title" into udc-dev am: 60ef9de1 am: 7fc54b47 am: a26335ff am: 918fe430

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



Change-Id: Ieddd0befa2ecb496bc991897d0df6c1c54522754
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 7e272478 918fe430

packages/CredentialManager/src/com/android/credentialmanager/DataConverter.kt

+2 −7
Original line number Diff line number Diff line
@@ -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,