| commit | f2029b13f94908f30bfd91091355d83d66be61f1 | [log] [tgz] |
|---|---|---|
| author | thiruram <thiruram@google.com> | Wed Feb 10 23:44:05 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Feb 10 23:44:05 2021 +0000 |
| tree | 87a44b6aa080edd6a34e0bdaf4001be24dfbfa37 | |
| parent | 4f2559ea0b4fc37a1c85e3b80a63da013bcfce7f [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: I53df2876913b11f892c05df0b0b824b4ce99967a
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) {