From d7d9d4892cb7cb45aecae9820e331e86ca6da800 Mon Sep 17 00:00:00 2001
From: Helen Qin <helenqin@google.com>
Date: Tue, 9 May 2023 03:38:59 +0000
Subject: [PATCH] Only honor preferUiBrandingComponentName with permission

preferUiBrandingComponentName should only be honored if the caller app
has the permission
android.permission.CREDENTIAL_MANAGER_SET_ALLOWED_PROVIDERS.

Bug: 281599707
Test: manual
Change-Id: I8e9db2b89b37f05515f05fc5e8c64d27cd5b9e51
---
 .../src/com/android/credentialmanager/DataConverter.kt         | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/packages/CredentialManager/src/com/android/credentialmanager/DataConverter.kt b/packages/CredentialManager/src/com/android/credentialmanager/DataConverter.kt
index c64ebda2eb5c9..86be1fecb6b0f 100644
--- 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())