Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 59444f38 authored by Julia Reynolds's avatar Julia Reynolds Committed by Automerger Merge Worker
Browse files

Merge "Toast app icon display is inconsistent for system apps" am: 822d1a86 am: 37e216ea 

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



Change-Id: I088b58514c7318dad7dc33d99bc394e114ed056e
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 34263f36 37e216ea

packages/SystemUI/src/com/android/systemui/toast/SystemUIToast.java

+2 −2
Original line number Diff line number Diff line
@@ -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) {