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

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

Merge "Only honor preferUiBrandingComponentName with permission" into udc-dev

parents 02416e15 d7d9d489

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())