commit 61620e75375b45fb88c72336624a9bf3d355fbe3
author thiruram <thiruram@google.com> Tue Feb 09 09:53:37 2021 -0800
committer thiruram <thiruram@google.com> Tue Feb 09 10:52:11 2021 -0800
tree 066d11cd48bf0ad3587e71b98f737a37732fde8d
parent 823c5f8bf66d0d66f6e11fae53c720a0977b8005

Fixes NPE with LAUNCHER_ALLAPPS_EXIT log event.

Bug: 179720471
Test: rnlt -until-error -t com.android.launcher3.ui.TaplTestsLauncher3
Change-Id: Ic8f91092aa060a2225c059a89a33b6877cf35f36

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 e52c790..608affe 100644
--- a/src/com/android/launcher3/allapps/search/LiveSearchManager.java
+++ b/src/com/android/launcher3/allapps/search/LiveSearchManager.java
@@ -157,7 +157,10 @@
         if (finalState.equals(ALL_APPS)) {
             mLogInstanceId = new InstanceIdSequence().newInstanceId();
             logger.withInstanceId(mLogInstanceId).log(LAUNCHER_ALLAPPS_ENTRY);
-        } else if (mPrevLauncherState.equals(ALL_APPS)) {
+        } else if (mPrevLauncherState.equals(ALL_APPS)
+                // Check if mLogInstanceId is not null; to avoid NPE when LAUNCHER_ALLAPPS_EXIT is
+                // triggered multiple times
+                && mLogInstanceId != null) {
             logger.withInstanceId(mLogInstanceId).log(LAUNCHER_ALLAPPS_EXIT);
             mLogInstanceId = null;
         }