am c0c51adc: am 630dfb41: am 081ba853: Merge "Use correct API for badging" into lmp-dev

* commit 'c0c51adc77aca5fcdb7cd08f0fa3b73395848eb0':
  Use correct API for badging

core/java/android/app/ApplicationPackageManager.java

@@ -1693,7 +1693,7 @@ final class ApplicationPackageManager extends PackageManager {
         if (dr == null) {
             dr = itemInfo.loadDefaultIcon(this);
         }
-        return getUserBadgedDrawableForDensity(dr, new UserHandle(mContext.getUserId()), null, 0);
+        return getUserBadgedIcon(dr, new UserHandle(mContext.getUserId()));
     }
 
     private Drawable getBadgedDrawable(Drawable drawable, Drawable badgeDrawable,

packages/SystemUI/src/com/android/systemui/recent/RecentTasksLoader.java

@@ -203,8 +203,7 @@ public class RecentTasksLoader implements View.OnTouchListener {
         Drawable icon = getFullResIcon(td.resolveInfo, pm);
         if (td.userId != UserHandle.myUserId()) {
             // Need to badge the icon
-            icon = mContext.getPackageManager().getUserBadgedDrawableForDensity(icon,
-                    new UserHandle(td.userId), null, 0);
+            icon = mContext.getPackageManager().getUserBadgedIcon(icon, new UserHandle(td.userId));
         }
         if (DEBUG) Log.v(TAG, "Loaded bitmap for task "
                 + td + ": " + thumbnail);

packages/SystemUI/src/com/android/systemui/recents/misc/SystemServicesProxy.java

@@ -356,7 +356,7 @@ public class SystemServicesProxy {
      */
     public Drawable getBadgedIcon(Drawable icon, int userId) {
         if (userId != UserHandle.myUserId()) {
-            icon = mPm.getUserBadgedDrawableForDensity(icon, new UserHandle(userId), null, 0);
+            icon = mPm.getUserBadgedIcon(icon, new UserHandle(userId));
         }
         return icon;
     }