| commit | b16be229cb59850414981b1c4273bf25fe720aff | [log] [tgz] |
|---|---|---|
| author | thiruram <thiruram@google.com> | Wed Feb 10 23:44:08 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Feb 10 23:44:08 2021 +0000 |
| tree | 5a2f71394d72744bbf58b6b6224ff55f7aa4c2a6 | |
| parent | b4bd0af611a5a642a366c5964330d849b46cf560 [diff] | |
| parent | 91d4f9f00781046f6f8808a9d774949d7a9b48ba [diff] |
Fix to avoid NPE with LiveSearchManager. am: 91d4f9f007 Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/13546785 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Iee1335070081b11ddcf148be7179448f191e8f3c
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) {