commit 847f0f1030340980a415bb79ec4a199f0ff185ac
author Thiru Ramasamy <thiruram@google.com> Tue Feb 09 23:52:41 2021 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Tue Feb 09 23:52:41 2021 +0000
tree 49cb94e524a1f7bd03035d65a64dd1badc955afd
parent 6b717f876e18aace9fa44a2897441acfcd7518e9
parent 9012515fef982a62d3b589d7da43014bd80bee5c

Merge "Fixes NPE with LAUNCHER_ALLAPPS_EXIT log event." into sc-dev am: 9012515fef

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I7ae847272dbfff919ca3ec20bdb6599f5a36e339

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