commit e4a0bbfb376095d2703e93a58d1ba108a7deaf74
author TreeHugger Robot <treehugger-gerrit@google.com> Fri Jul 02 19:20:35 2021 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Fri Jul 02 19:20:35 2021 +0000
tree 5754b9fa2cb5e5fde03d87ba3f4036a02e65e22a
parent 60e16e9a7225da9a7786918b120998f1384244df
parent 667c605d4062b9ce26864af6e3cfadef2c9c3267

Merge "Fix NPE inside dispatchRestoreInstanceState" into sc-dev am: 04d4d0d4f9 am: 667c605d40

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

Change-Id: I46967408354d4a46626c46f563aa17743f199ea7

src/com/android/launcher3/allapps/AllAppsContainerView.java

diff --git a/src/com/android/launcher3/allapps/AllAppsContainerView.java b/src/com/android/launcher3/allapps/AllAppsContainerView.java
index d1e643f..f4fa1e5 100644
--- a/src/com/android/launcher3/allapps/AllAppsContainerView.java
+++ b/src/com/android/launcher3/allapps/AllAppsContainerView.java
@@ -188,11 +188,11 @@
         Bundle state = (Bundle) sparseArray.get(R.id.work_tab_state_id, null);
         if (state != null) {
             int currentPage = state.getInt(BUNDLE_KEY_CURRENT_PAGE, 0);
-            if (currentPage != 0) {
+            if (currentPage != 0 && mViewPager != null) {
                 mViewPager.setCurrentPage(currentPage);
                 rebindAdapters(true);
             } else {
-                mSearchUiManager.resetSearch();
+                reset(true);
             }
         }