commit 04d4d0d4f9b260bde921998e54f76f126c3efcef
author TreeHugger Robot <treehugger-gerrit@google.com> Fri Jul 02 18:46:30 2021 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Jul 02 18:46:30 2021 +0000
tree c319994518aa09c8a188dd87611aa6f47c9a157b
parent 6348858734eb5a7aed69c10837b5fb4f862191e8
parent 9804c0472e3776d9a82178e1c6b1d4f510deb255

Merge "Fix NPE inside dispatchRestoreInstanceState" into sc-dev

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