Merge "Cache shortcut icons" into main

5 files changed, 48 insertions, 16 deletions

diff --git a/java/src/com/android/intentresolver/ChooserListAdapter.java b/java/src/com/android/intentresolver/ChooserListAdapter.java
index 8b848e55..ff0c40d7 100644
--- a/java/src/com/android/intentresolver/ChooserListAdapter.java
+++ b/java/src/com/android/intentresolver/ChooserListAdapter.java
@@ -479,17 +479,23 @@ public class ChooserListAdapter extends ResolverListAdapter {
 
     private void loadDirectShareIcon(SelectableTargetInfo info) {
         if (mRequestedIcons.add(info)) {
-            mTargetDataLoader.loadDirectShareIcon(
+            Drawable icon = mTargetDataLoader.getOrLoadDirectShareIcon(
                     info,
                     getUserHandle(),
-                    (drawable) -> onDirectShareIconLoaded(info, drawable));
+                    (drawable) -> onDirectShareIconLoaded(info, drawable, true));
+            if (icon != null) {
+                onDirectShareIconLoaded(info, icon, false);
+            }
         }
     }
 
-    private void onDirectShareIconLoaded(SelectableTargetInfo mTargetInfo, Drawable icon) {
+    private void onDirectShareIconLoaded(
+            SelectableTargetInfo mTargetInfo, @Nullable Drawable icon, boolean notify) {
         if (icon != null && !mTargetInfo.hasDisplayIcon()) {
             mTargetInfo.getDisplayIconHolder().setDisplayIcon(icon);
-            notifyDataSetChanged();
+            if (notify) {
+                notifyDataSetChanged();
+            }
         }
     }
 
diff --git a/java/src/com/android/intentresolver/icons/CachingTargetDataLoader.kt b/java/src/com/android/intentresolver/icons/CachingTargetDataLoader.kt
index b3054231..8474b4c3 100644
--- a/java/src/com/android/intentresolver/icons/CachingTargetDataLoader.kt
+++ b/java/src/com/android/intentresolver/icons/CachingTargetDataLoader.kt
@@ -28,7 +28,7 @@ import javax.inject.Qualifier
 
 @Qualifier @MustBeDocumented @Retention(AnnotationRetention.BINARY) annotation class Caching
 
-private typealias IconCache = LruCache<ComponentName, Drawable>
+private typealias IconCache = LruCache<String, Drawable>
 
 class CachingTargetDataLoader(
     private val targetDataLoader: TargetDataLoader,
@@ -49,18 +49,27 @@ class CachingTargetDataLoader(
             }
     }
 
-    override fun loadDirectShareIcon(
+    override fun getOrLoadDirectShareIcon(
         info: SelectableTargetInfo,
         userHandle: UserHandle,
         callback: Consumer<Drawable>
-    ) = targetDataLoader.loadDirectShareIcon(info, userHandle, callback)
+    ): Drawable? {
+        val cacheKey = info.toCacheKey()
+        return cacheKey?.let { getCachedAppIcon(it, userHandle) }
+            ?: targetDataLoader.getOrLoadDirectShareIcon(info, userHandle) { drawable ->
+                if (cacheKey != null) {
+                    getProfileIconCache(userHandle).put(cacheKey, drawable)
+                }
+                callback.accept(drawable)
+            }
+    }
 
     override fun loadLabel(info: DisplayResolveInfo, callback: Consumer<LabelInfo>) =
         targetDataLoader.loadLabel(info, callback)
 
     override fun getOrLoadLabel(info: DisplayResolveInfo) = targetDataLoader.getOrLoadLabel(info)
 
-    private fun getCachedAppIcon(component: ComponentName, userHandle: UserHandle): Drawable? =
+    private fun getCachedAppIcon(component: String, userHandle: UserHandle): Drawable? =
         getProfileIconCache(userHandle)[component]
 
     private fun getProfileIconCache(userHandle: UserHandle): IconCache =
@@ -70,7 +79,20 @@ class CachingTargetDataLoader(
 
     private fun DisplayResolveInfo.toCacheKey() =
         ComponentName(
-            resolveInfo.activityInfo.packageName,
-            resolveInfo.activityInfo.name,
-        )
+                resolveInfo.activityInfo.packageName,
+                resolveInfo.activityInfo.name,
+            )
+            .flattenToString()
+
+    private fun SelectableTargetInfo.toCacheKey(): String? =
+        if (chooserTargetIcon != null) {
+            // do not cache icons for caller-provided targets
+            null
+        } else {
+            buildString {
+                append(chooserTargetComponentName?.flattenToString() ?: "")
+                append("|")
+                append(directShareShortcutInfo?.id ?: "")
+            }
+        }
 }
diff --git a/java/src/com/android/intentresolver/icons/DefaultTargetDataLoader.kt b/java/src/com/android/intentresolver/icons/DefaultTargetDataLoader.kt
index 1a724d73..e7392f58 100644
--- a/java/src/com/android/intentresolver/icons/DefaultTargetDataLoader.kt
+++ b/java/src/com/android/intentresolver/icons/DefaultTargetDataLoader.kt
@@ -77,11 +77,11 @@ class DefaultTargetDataLoader(
         return null
     }
 
-    override fun loadDirectShareIcon(
+    override fun getOrLoadDirectShareIcon(
         info: SelectableTargetInfo,
         userHandle: UserHandle,
         callback: Consumer<Drawable>,
-    ) {
+    ): Drawable? {
         val taskId = nextTaskId.getAndIncrement()
         LoadDirectShareIconTask(
                 context.createContextAsUser(userHandle, 0),
@@ -93,6 +93,7 @@ class DefaultTargetDataLoader(
             }
             .also { addTask(taskId, it) }
             .executeOnExecutor(executor)
+        return null
     }
 
     override fun loadLabel(info: DisplayResolveInfo, callback: Consumer<LabelInfo>) {
diff --git a/java/src/com/android/intentresolver/icons/LoadDirectShareIconTask.java b/java/src/com/android/intentresolver/icons/LoadDirectShareIconTask.java
index 0f135d63..e2c0362d 100644
--- a/java/src/com/android/intentresolver/icons/LoadDirectShareIconTask.java
+++ b/java/src/com/android/intentresolver/icons/LoadDirectShareIconTask.java
@@ -57,7 +57,7 @@ class LoadDirectShareIconTask extends BaseLoadIconTask {
 
     @Override
     protected Drawable doInBackground(Void... voids) {
-        Drawable drawable;
+        Drawable drawable = null;
         Trace.beginSection("shortcut-icon");
         try {
             final Icon icon = mTargetInfo.getChooserTargetIcon();
@@ -70,6 +70,8 @@ class LoadDirectShareIconTask extends BaseLoadIconTask {
             } else {
                 Log.e(TAG, "Failed to load shortcut icon for "
                         + mTargetInfo.getChooserTargetComponentName() + "; no access");
+            }
+            if (drawable == null) {
                 drawable = loadIconPlaceholder();
             }
         } catch (Exception e) {
@@ -86,6 +88,7 @@ class LoadDirectShareIconTask extends BaseLoadIconTask {
     }
 
     @WorkerThread
+    @Nullable
     private Drawable getChooserTargetIconDrawable(
             Context context,
             @Nullable Icon icon,
diff --git a/java/src/com/android/intentresolver/icons/TargetDataLoader.kt b/java/src/com/android/intentresolver/icons/TargetDataLoader.kt
index 7789df44..935b527a 100644
--- a/java/src/com/android/intentresolver/icons/TargetDataLoader.kt
+++ b/java/src/com/android/intentresolver/icons/TargetDataLoader.kt
@@ -32,11 +32,11 @@ abstract class TargetDataLoader {
     ): Drawable?
 
     /** Load a shortcut icon */
-    abstract fun loadDirectShareIcon(
+    abstract fun getOrLoadDirectShareIcon(
         info: SelectableTargetInfo,
         userHandle: UserHandle,
         callback: Consumer<Drawable>,
-    )
+    ): Drawable?
 
     /** Load target label */
     abstract fun loadLabel(info: DisplayResolveInfo, callback: Consumer<LabelInfo>)