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

Commit d43f7696 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "When the origin is empty but not null, app label should be used" into udc-dev am: 0d4cf06b 

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



Change-Id: I79fabb59b6581464bc1989f1e7111f708b2e7c5b
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 3fd256ed 0d4cf06b

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,
@@ -462,7 +462,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