Merge "Cache shortcut icons" into main

1 files changed, 3 insertions, 2 deletions

diff --git a/tests/activity/src/com/android/intentresolver/ResolverWrapperActivity.java b/tests/activity/src/com/android/intentresolver/ResolverWrapperActivity.java
index b46d8bc3..22633085 100644
--- a/tests/activity/src/com/android/intentresolver/ResolverWrapperActivity.java
+++ b/tests/activity/src/com/android/intentresolver/ResolverWrapperActivity.java
@@ -180,11 +180,12 @@ public class ResolverWrapperActivity extends ResolverActivity {
         }
 
         @Override
-        public void loadDirectShareIcon(
+        @Nullable
+        public Drawable getOrLoadDirectShareIcon(
                 @NonNull SelectableTargetInfo info,
                 @NonNull UserHandle userHandle,
                 @NonNull Consumer<Drawable> callback) {
-            mTargetDataLoader.loadDirectShareIcon(info, userHandle, callback);
+            return mTargetDataLoader.getOrLoadDirectShareIcon(info, userHandle, callback);
         }
 
         @Override