Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9c21bc07 authored by Becky Qiu's avatar Becky Qiu Committed by Android (Google) Code Review
Browse files

Merge "[Toast] Fix the NPE in isPersonalTab()." into tm-dev

parents 787c0e13 f0fd3d8e
Loading
Loading
Loading
Loading
+5 −1
Original line number Diff line number Diff line
@@ -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);