commit 91d4f9f00781046f6f8808a9d774949d7a9b48ba
author thiruram <thiruram@google.com> Wed Feb 10 12:23:11 2021 -0800
committer Thiru Ramasamy <thiruram@google.com> Wed Feb 10 23:24:32 2021 +0000
tree 87a44b6aa080edd6a34e0bdaf4001be24dfbfa37
parent 99f23c97144187b06ac249c1bd98c741a175759d

Fix to avoid NPE with LiveSearchManager.

Bug: 179911188
Test: manual
Change-Id: Ic7f8ae7f7e2795eb18569670e166310102b7ea02

src/com/android/launcher3/allapps/search/LiveSearchManager.java

diff --git a/src/com/android/launcher3/allapps/search/LiveSearchManager.java b/src/com/android/launcher3/allapps/search/LiveSearchManager.java
index d51c786..748ba50 100644
--- a/src/com/android/launcher3/allapps/search/LiveSearchManager.java
+++ b/src/com/android/launcher3/allapps/search/LiveSearchManager.java
@@ -153,11 +153,11 @@
             clearWidgetHost();
         }
 
-        if (finalState.equals(ALL_APPS)) {
+        if (ALL_APPS.equals(finalState)) {
             // creates new instance ID since new all apps session is started.
             mLogInstanceId = new InstanceIdSequence().newInstanceId();
             allAppsLogger().log(LAUNCHER_ALLAPPS_ENTRY);
-        } else if (mPrevLauncherState.equals(ALL_APPS)
+        } else if (ALL_APPS.equals(mPrevLauncherState)
                 // Check if mLogInstanceId is not null; to avoid NPE when LAUNCHER_ALLAPPS_EXIT is
                 // triggered multiple times
                 && mLogInstanceId != null) {