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

Commit 37e216ea 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 

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



Change-Id: I3a1f65d9c75d24b9c204229f44ac18f20a84f439
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents e19fda14 822d1a86

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