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

Merge "Toast app icon display is inconsistent for system apps" am: 822d1a869e am: 37e216eaad am: 59444f38c0

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

Change-Id: Ib93d00bf487abc36837e60dfbb456799dab82879
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Julia Reynolds
2023-04-12 02:29:05 +00:00
committed by Automerger Merge Worker
parent 85b00fa9b1 59444f38c0
commit ce81a9d77e
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
packages/SystemUI/src/com/android/systemui/toast/SystemUIToast.java
View File

@@ -272,10 +272,10 @@ public class SystemUIToast implements ToastPlugin.Toast {
private static boolean showApplicationIcon(ApplicationInfo appInfo,
PackageManager packageManager) {
if (hasFlag(appInfo.flags, FLAG_UPDATED_SYSTEM_APP)) {
if (hasFlag(appInfo.flags, FLAG_UPDATED_SYSTEM_APP | FLAG_SYSTEM)) {
return packageManager.getLaunchIntentForPackage(appInfo.packageName) != null;
}
return !hasFlag(appInfo.flags, FLAG_SYSTEM);
return true;
}
private static boolean hasFlag(int flags, int flag) {