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

2023-05-09 17:09:12 +00:00
parent 02416e1589 d7d9d4892c
commit b6699962a2
1 changed files with 2 additions and 1 deletions
--- a/packages/CredentialManager/src/com/android/credentialmanager/DataConverter.kt
+++ b/packages/CredentialManager/src/com/android/credentialmanager/DataConverter.kt
@@ -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())