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

Commit 75a4761c authored by Helen Qin's avatar Helen Qin
Browse files

When the origin is empty but not null, app label should be used 

Bug: 280902737
Test: manual (see bug for screenshot)
Change-Id: I1edc10ba6887f360e4184bf7a93b8ebb78f0e4c5
parent 9e6c6ca8

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

+2 −2
Original line number Diff line number Diff line
@@ -213,7 +213,7 @@ class GetFlowUtils { 
                    }

                }

            return com.android.credentialmanager.getflow.RequestDisplayInfo(

                appName = originName

                appName = originName?.ifEmpty { null }

                    ?: getAppLabel(context.packageManager, requestInfo.appPackageName)

                    ?: return null,

                preferImmediatelyAvailableCredentials = preferImmediatelyAvailableCredentials,
@@ -461,7 +461,7 @@ class CreateFlowUtils { 
            if (requestInfo == null) {

                return null

            }

            val appLabel = originName

            val appLabel = originName?.ifEmpty { null }

                ?: getAppLabel(context.packageManager, requestInfo.appPackageName)

                ?: return null

            val createCredentialRequest = requestInfo.createCredentialRequest ?: return null