commit 6952e1233b140d5fdba42177177eb89b74858f5f
author TreeHugger Robot <treehugger-gerrit@google.com> Mon May 10 23:02:45 2021 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Mon May 10 23:02:45 2021 +0000
tree 1a4d845c9c7f6c102af59769d4b9df94f5dae2f5
parent 58df3382132d418166193f220c4f80b8b141f568
parent db58e41241a84640b8ec15bd29ff4366aa92fc52

Merge "Avoid rebind if data didn't change" into sc-dev am: db58e41241

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/14471374

Change-Id: I03fd02dc219b8f8616c40672d2a6ff9e6e752ca8

src/com/android/launcher3/allapps/AlphabeticalAppsList.java

diff --git a/src/com/android/launcher3/allapps/AlphabeticalAppsList.java b/src/com/android/launcher3/allapps/AlphabeticalAppsList.java
index 6957850..88d95fa 100644
--- a/src/com/android/launcher3/allapps/AlphabeticalAppsList.java
+++ b/src/com/android/launcher3/allapps/AlphabeticalAppsList.java
@@ -30,6 +30,7 @@
 import java.util.List;
 import java.util.Locale;
 import java.util.Map;
+import java.util.Objects;
 import java.util.TreeMap;
 
 /**
@@ -181,11 +182,10 @@
      * Sets results list for search
      */
     public boolean setSearchResults(ArrayList<AdapterItem> results) {
-        if (results == null || mSearchResults != results) {
-            boolean same = mSearchResults != null && mSearchResults.equals(results);
+        if (!Objects.equals(results, mSearchResults)) {
             mSearchResults = results;
             updateAdapterItems();
-            return !same;
+            return true;
         }
         return false;
     }