From f0fd3d8e2ec49bb11596922e26ea436f1eb7e86d Mon Sep 17 00:00:00 2001
From: Becky Qiu <xuqiu@google.com>
Date: Fri, 6 May 2022 16:57:46 -0700
Subject: [PATCH] [Toast] Fix the NPE in isPersonalTab().

Don't set mUsingTab until replaceRVContainer is done.

Bug: 224882720
Test: manual
Change-Id: I9ebec067d06df5e890ffe3c90d49f1de51b3b981
---
 .../android/launcher3/allapps/BaseAllAppsContainerView.java | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/com/android/launcher3/allapps/BaseAllAppsContainerView.java b/src/com/android/launcher3/allapps/BaseAllAppsContainerView.java
index 4390b5162b..ded65b07bd 100644
--- a/src/com/android/launcher3/allapps/BaseAllAppsContainerView.java
+++ b/src/com/android/launcher3/allapps/BaseAllAppsContainerView.java
@@ -437,8 +437,12 @@ public abstract class BaseAllAppsContainerView<T extends Context & ActivityConte
         if (showTabs == mUsingTabs && !force) {
             return;
         }
+
+        // replaceRVcontainer() needs to use both mUsingTabs value to remove the old view AND
+        // showTabs value to create new view. Hence the mUsingTabs new value assignment MUST happen
+        // after this call.
+        replaceRVContainer(showTabs);
         mUsingTabs = showTabs;
-        replaceRVContainer(mUsingTabs);
 
         mAllAppsStore.unregisterIconContainer(mAH.get(AdapterHolder.MAIN).mRecyclerView);
         mAllAppsStore.unregisterIconContainer(mAH.get(AdapterHolder.WORK).mRecyclerView);