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

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

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

Change-Id: I6fb6b1718b7631546de1fa257899b60c69b26b71

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;
     }