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

Commit 02582322 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Only honor preferUiBrandingComponentName with permission" into udc-dev am: b6699962 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23102617



Change-Id: Ia5e4353e6b8544dc7731175a9acf49c295b4d0e6
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 4a712b5b b6699962

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