[BottomSheet] Fixed NullPointerException when calling updatePeekHeigh…

…t with null viewRef PiperOrigin-RevId: 323107185
material-components · Aug 4, 2020 · 34df6d9 · 34df6d9
1 parent 1047370
commit 34df6d9
Showing 1 changed file with 11 additions and 9 deletions.
diff --git a/lib/java/com/google/android/material/bottomsheet/BottomSheetBehavior.java b/lib/java/com/google/android/material/bottomsheet/BottomSheetBehavior.java
@@ -770,20 +770,22 @@ public final void setPeekHeight(int peekHeight, boolean animate) {
     }
     // If sheet is already laid out, recalculate the collapsed offset based on new setting.
     // Otherwise, let onLayoutChild handle this later.
-    if (layout && viewRef != null) {
+    if (layout) {
       updatePeekHeight(animate);
     }
   }
 
   private void updatePeekHeight(boolean animate) {
-    calculateCollapsedOffset();
-    if (state == STATE_COLLAPSED) {
-      V view = viewRef.get();
-      if (view != null) {
-        if (animate) {
-          settleToStatePendingLayout(state);
-        } else {
-          view.requestLayout();
+    if (viewRef != null) {
+      calculateCollapsedOffset();
+      if (state == STATE_COLLAPSED) {
+        V view = viewRef.get();
+        if (view != null) {
+          if (animate) {
+            settleToStatePendingLayout(state);
+          } else {
+            view.requestLayout();
+          }
         }
       }
     }