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

Commit 99ce346f 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: I1855eeeb29945ae0238468872f0908b6e6b0a625
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 11fb3a9a 0d4cf06b

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

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

                    }

                }

                }

            return com.android.credentialmanager.getflow.RequestDisplayInfo(

            return com.android.credentialmanager.getflow.RequestDisplayInfo(

                appName = originName

                appName = originName?.ifEmpty { null }

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

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

                    ?: return null,

                    ?: return null,

                preferImmediatelyAvailableCredentials = preferImmediatelyAvailableCredentials,

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

            if (requestInfo == null) {

                return null

                return null

            }

            }

            val appLabel = originName

            val appLabel = originName?.ifEmpty { null }

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

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

                ?: return null

                ?: return null

            val createCredentialRequest = requestInfo.createCredentialRequest ?: return null

            val createCredentialRequest = requestInfo.createCredentialRequest ?: return null