commit e70df0528dee08e8f80014cd1347f65307d30a62
author android-build-team Robot <android-build-team-robot@google.com> Wed Dec 11 04:14:48 2019 +0000
committer android-build-team Robot <android-build-team-robot@google.com> Wed Dec 11 04:14:48 2019 +0000
tree d5c691dc92ad190bb3de7c7b69204db01988dd54
parent b561b46382c6f1a32ac19702a4463b6c6527b5cd
parent 24db3af6c03dee2e8872f95fd5a4514585df3cd8

Snap for 6063671 from 24db3af6c03dee2e8872f95fd5a4514585df3cd8 to rvc-release

Change-Id: I82de875cb0bb065e4173d3a5c4dc495f90388102

quickstep/src/com/android/quickstep/TaskIconCache.java

diff --git a/quickstep/src/com/android/quickstep/TaskIconCache.java b/quickstep/src/com/android/quickstep/TaskIconCache.java
index e590aea..7ff799e 100644
--- a/quickstep/src/com/android/quickstep/TaskIconCache.java
+++ b/quickstep/src/com/android/quickstep/TaskIconCache.java
@@ -48,6 +48,7 @@
 import com.android.systemui.shared.recents.model.Task.TaskKey;
 import com.android.systemui.shared.system.ActivityManagerWrapper;
 import com.android.systemui.shared.system.PackageManagerWrapper;
+import com.android.systemui.shared.system.TaskDescriptionCompat;
 
 import java.util.function.Consumer;
 
@@ -140,7 +141,7 @@
 
         // Load icon
         // TODO: Load icon resource (b/143363444)
-        Bitmap icon = desc.getIcon();
+        Bitmap icon = TaskDescriptionCompat.getIcon(desc, key.userId);
         if (icon != null) {
             entry.icon = new FastBitmapDrawable(getBitmapInfo(
                     new BitmapDrawable(mContext.getResources(), icon),