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

Commit dc871c66 authored by Automerger Merge Worker's avatar Automerger Merge Worker Committed by Android (Google) Code Review
Browse files

Merge "Merge "Only honor preferUiBrandingComponentName with permission" into... 

Merge "Merge "Only honor preferUiBrandingComponentName with permission" into udc-dev am: b6699962 am: 02582322" into udc-d1-dev-plus-aosp
parents d4254160 a60d816b

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

+2 −1
Original line number Diff line number Diff line
@@ -201,7 +201,8 @@ class GetFlowUtils { 
                    ComponentName::class.java

                )

            val preferTopBrandingContent: TopBrandingContent? =

                if (preferUiBrandingComponentName == null) null

                if (!requestInfo.hasPermissionToOverrideDefault() ||

                    preferUiBrandingComponentName == null) null

                else {

                    val (displayName, icon) = getServiceLabelAndIcon(

                        context.packageManager, preferUiBrandingComponentName.flattenToString())