summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Andrey Epin <ayepin@google.com> 2022-08-04 05:24:32 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2022-08-04 05:24:32 +0000
commit86514f601ff7740a2f259ceed76c086d9788f6a0 (patch)
treebfcd390748700199dacb11fe35d3ee079fd9d238
parent9a861ea283811fcf774bb07b7c23cd1deb521cc0 (diff)
parent45fe7a2d686457809eeeece170a15029fc61ed20 (diff)
Merge "Update icon only once" into tm-qpr-dev am: 754656a669 am: 45fe7a2d68
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19263009 Change-Id: I8853f6e83546b4122f7860f75f504183bb03b5c1 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r--core/java/com/android/internal/app/ResolverListAdapter.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/core/java/com/android/internal/app/ResolverListAdapter.java b/core/java/com/android/internal/app/ResolverListAdapter.java
index b32afb44852a..66fff5c13ab7 100644
--- a/core/java/com/android/internal/app/ResolverListAdapter.java
+++ b/core/java/com/android/internal/app/ResolverListAdapter.java
@@ -951,7 +951,7 @@ public class ResolverListAdapter extends BaseAdapter {
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