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

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15184364 Change-Id: I2ab86183cc5cd32b233b596364acfd329d8211a9
2021-07-02 19:05:02 +00:00
parent 535c4957e6 04d4d0d4f9
commit fc9d97164c
1 changed files with 2 additions and 2 deletions
@@ -188,11 +188,11 @@ public class AllAppsContainerView extends SpringRelativeLayout implements DragSo
        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);
            }
        }