commit 48059dc7061b3144ba0b2f49d4ac4da7f7471752
author TreeHugger Robot <treehugger-gerrit@google.com> Thu May 17 15:51:40 2018 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu May 17 15:51:40 2018 +0000
tree 666e4f16452a8e353dd8b67b3821706f10481cac
parent 64d19820f6c3873604f6128a837456270d5f780e
parent d460c084eb4751436e7ebd9c3025defca7b236a3

Merge "Fixes a crash when turning off workprofile while the workprofile tab is active." into ub-launcher3-edmonton

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

diff --git a/src/com/android/launcher3/allapps/FloatingHeaderView.java b/src/com/android/launcher3/allapps/FloatingHeaderView.java
index 5a66ccd..462e7f3 100644
--- a/src/com/android/launcher3/allapps/FloatingHeaderView.java
+++ b/src/com/android/launcher3/allapps/FloatingHeaderView.java
@@ -96,7 +96,7 @@
         mMainRV = setupRV(mMainRV, mAH[AllAppsContainerView.AdapterHolder.MAIN].recyclerView);
         mWorkRV = setupRV(mWorkRV, mAH[AllAppsContainerView.AdapterHolder.WORK].recyclerView);
         mParent = (ViewGroup) mMainRV.getParent();
-        setMainActive(mMainRVActive);
+        setMainActive(mMainRVActive || mWorkRV == null);
         reset(false);
     }