| commit | 49851c877c51af9155db935c01ec6f96e8c78b50 | [log] [tgz] |
|---|---|---|
| author | Android Build Merger (Role) <noreply-android-build-merger@google.com> | Thu May 17 08:13:30 2018 +0000 |
| committer | Android Build Merger (Role) <noreply-android-build-merger@google.com> | Thu May 17 08:13:30 2018 +0000 |
| tree | 82664b6137044087e018a921a4e856f18b9020c6 | |
| parent | 90638f861394ae1ef19c714c07d7b99d51cf3900 [diff] | |
| parent | d460c084eb4751436e7ebd9c3025defca7b236a3 [diff] |
[automerger] Fixes a crash when turning off workprofile while the workprofile tab is active. am: d460c084eb Change-Id: Id0fb9ee86ce31e498d454e6dc2732ea1a9b02c05
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); }