commit 42cfeadb034020f9cc42b766d0db78a96866f07f
author Winson Chung <winsonc@google.com> Wed Dec 11 18:07:58 2019 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Dec 11 18:07:58 2019 +0000
tree 42afe206f602303915f67263c02ef42fcacfdbd6
parent fbe947a223c8d41af6c2342ddef31e7672bdea6d
parent 1d8a58213075ee6ccd64cbad836d6cb2f78394cd

Merge "Pass user id with call to get icon from task description" into ub-launcher3-master

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