Merge "Toast app icon display is inconsistent for system apps"

This commit is contained in:
Julia Reynolds
2023-04-11 21:45:48 +00:00
committed by Gerrit Code Review

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) {