Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Treehugger Robot
2023-05-09 17:09:12 +00:00
committed by Android (Google) Code Review
parent 02416e1589 d7d9d4892c
commit b6699962a2
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
packages/CredentialManager/src/com/android/credentialmanager/DataConverter.kt
View File

@@ -201,7 +201,8 @@ class GetFlowUtils {
ComponentName::class.java ComponentName::class.java
) )
val preferTopBrandingContent: TopBrandingContent? = val preferTopBrandingContent: TopBrandingContent? =
if (preferUiBrandingComponentName == null) null if (!requestInfo.hasPermissionToOverrideDefault() ||
preferUiBrandingComponentName == null) null
else { else {
val (displayName, icon) = getServiceLabelAndIcon( val (displayName, icon) = getServiceLabelAndIcon(
context.packageManager, preferUiBrandingComponentName.flattenToString()) context.packageManager, preferUiBrandingComponentName.flattenToString())