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

Commit f54768a9 authored by Hai Zhang's avatar Hai Zhang Committed by android-build-merger
Browse files

Merge "Let launcher3 IconFactory add user badges." into qt-dev 

am: 14ad8ec8

Change-Id: I0eca2b3ceb0fbcd1e7ddfe92ef6624af6315a1b9
parents bccb6035 14ad8ec8

src/com/android/packageinstaller/permission/utils/Utils.java

+4 −9
Original line number Diff line number Diff line
@@ -59,7 +59,6 @@ import android.graphics.Bitmap; 
import android.graphics.drawable.BitmapDrawable;

import android.graphics.drawable.Drawable;

import android.os.Parcelable;

import android.os.Process;

import android.os.UserHandle;

import android.os.UserManager;

import android.provider.DeviceConfig;
@@ -720,16 +719,12 @@ public final class Utils { 
    public static @NonNull Drawable getBadgedIcon(@NonNull Context context,

            @NonNull ApplicationInfo appInfo) {

        UserHandle user = UserHandle.getUserHandleForUid(appInfo.uid);

        if (Process.myUserHandle().equals(user)) {

            return appInfo.loadIcon(context.getPackageManager());

        } else {

        try (IconFactory iconFactory = IconFactory.obtain(context)) {

            Bitmap iconBmp = iconFactory.createBadgedIconBitmap(

                    appInfo.loadUnbadgedIcon(context.getPackageManager()), user, false).icon;

            return new BitmapDrawable(context.getResources(), iconBmp);

        }

    }

    }



    /**

     * Get a string saying what apps with the given permission group can do.