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

Commit 0d4cf06b authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

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

parents 2c9791ff 75a4761c

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