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

Commit 963280cd 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: I91a74cf70203c0fb31a61ad09bc7ae4fd8eda34e
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents f3360c3d 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