From 61620e75375b45fb88c72336624a9bf3d355fbe3 Mon Sep 17 00:00:00 2001 From: thiruram Date: Tue, 9 Feb 2021 09:53:37 -0800 Subject: [PATCH] Fixes NPE with LAUNCHER_ALLAPPS_EXIT log event. Bug: 179720471 Test: rnlt -until-error -t com.android.launcher3.ui.TaplTestsLauncher3 Change-Id: Ic8f91092aa060a2225c059a89a33b6877cf35f36 --- .../android/launcher3/allapps/search/LiveSearchManager.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/com/android/launcher3/allapps/search/LiveSearchManager.java b/src/com/android/launcher3/allapps/search/LiveSearchManager.java index e52c79049f..608affeb2b 100644 --- a/src/com/android/launcher3/allapps/search/LiveSearchManager.java +++ b/src/com/android/launcher3/allapps/search/LiveSearchManager.java @@ -157,7 +157,10 @@ public class LiveSearchManager implements StateListener { 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; }