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 am: b6699962a2

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

Change-Id: Ibbcbfd81a8ac47de58691980a3fd1ba07299ff7f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Treehugger Robot
2023-05-09 17:23:28 +00:00
committed by Automerger Merge Worker
parent 4ae96c6a7d b6699962a2
commit cb7f8c1120
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
)
val preferTopBrandingContent: TopBrandingContent? =
if (preferUiBrandingComponentName == null) null
if (!requestInfo.hasPermissionToOverrideDefault() ||
preferUiBrandingComponentName == null) null
else {
val (displayName, icon) = getServiceLabelAndIcon(
context.packageManager, preferUiBrandingComponentName.flattenToString())