commit 9b73c86d321818204be58f932f0457788c9d766d
author TreeHugger Robot <treehugger-gerrit@google.com> Thu Mar 22 01:20:28 2018 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Mar 22 01:20:28 2018 +0000
tree f68c8510f0bc6ced1cdb0c8d5f2798a0df18ea67
parent c8fd022bbe2f1cb8e15bf8a49ea211aa4d8b06aa
parent 033e61412796c7c324da81b8ba01a09765ba79e7

Merge "Fixing crash when changing state while all-apps is not complete bound" into ub-launcher3-master

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

diff --git a/src/com/android/launcher3/allapps/AllAppsContainerView.java b/src/com/android/launcher3/allapps/AllAppsContainerView.java
index 8f5fcf5..ae41794 100644
--- a/src/com/android/launcher3/allapps/AllAppsContainerView.java
+++ b/src/com/android/launcher3/allapps/AllAppsContainerView.java
@@ -392,7 +392,8 @@
     }
 
     public RecyclerViewFastScroller getScrollBar() {
-        return getActiveRecyclerView().getScrollbar();
+        AllAppsRecyclerView rv = getActiveRecyclerView();
+        return rv == null ? null : rv.getScrollbar();
     }
 
     public void setupHeader() {