Merge "Add Null checks to NavigationBarView" into rvc-dev am: ac83472c3c am: 1c7366c3d2

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11893821

Change-Id: Id07dd7835f5de70aeb351d2c546fe2435a6cad37
This commit is contained in:
TreeHugger Robot
2020-06-18 15:02:21 +00:00
committed by Automerger Merge Worker

View File

@@ -822,7 +822,7 @@ public class NavigationBarView extends FrameLayout implements
*/ */
public void updateSlippery() { public void updateSlippery() {
setSlippery(!isQuickStepSwipeUpEnabled() || setSlippery(!isQuickStepSwipeUpEnabled() ||
(mPanelView.isFullyExpanded() && !mPanelView.isCollapsing())); (mPanelView != null && mPanelView.isFullyExpanded() && !mPanelView.isCollapsing()));
} }
private void setSlippery(boolean slippery) { private void setSlippery(boolean slippery) {