commit 754656a669035abc40b04c3a0b3f23c709a9b465
author Andrey Epin <ayepin@google.com> Thu Aug 04 04:43:17 2022 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Aug 04 04:43:17 2022 +0000
tree 76c229db03b073dd34c78677a306df64a7a48dc9
parent 4c78e5c98e66258ddf975055336a96a2aefd9210
parent 33f923ec77c4cb2bc12667416503af04563c75bb

Merge "Update icon only once" into tm-qpr-dev

core/java/com/android/internal/app/ResolverListAdapter.java

diff --git a/core/java/com/android/internal/app/ResolverListAdapter.java b/core/java/com/android/internal/app/ResolverListAdapter.java
index b32afb4..66fff5c 100644
--- a/core/java/com/android/internal/app/ResolverListAdapter.java
+++ b/core/java/com/android/internal/app/ResolverListAdapter.java
@@ -951,7 +951,7 @@
         protected void onPostExecute(Drawable d) {
             if (getOtherProfile() == mDisplayResolveInfo) {
                 mResolverListCommunicator.updateProfileViewButton();
-            } else {
+            } else if (!mDisplayResolveInfo.hasDisplayIcon()) {
                 mDisplayResolveInfo.setDisplayIcon(d);
                 mHolder.bindIcon(mDisplayResolveInfo);
                 // Notify in case view is already bound to resolve the race conditions on