| commit | 2dca7c82d1abb55dec399a20d3058990e9ce4b39 | [log] [tgz] |
|---|---|---|
| author | Aurimas Liutikas <aurimas@google.com> | Tue Mar 07 17:23:44 2017 +0000 |
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | Tue Mar 07 17:23:45 2017 +0000 |
| tree | ee8db987ab03da63891c5fa35d0679a62d2908fe | |
| parent | 086adf6651d1257c794e7da22560f0e6011335b0 [diff] | |
| parent | d1e6ea34363dbb189490bb793692c86c2ebecf47 [diff] |
Merge "Prevent potential NPE"
diff --git a/design/src/android/support/design/widget/BottomSheetBehavior.java b/design/src/android/support/design/widget/BottomSheetBehavior.java index d75623e..4419d86 100644 --- a/design/src/android/support/design/widget/BottomSheetBehavior.java +++ b/design/src/android/support/design/widget/BottomSheetBehavior.java
@@ -385,7 +385,8 @@ setStateInternal(STATE_EXPANDED); return; } - if (target != mNestedScrollingChildRef.get() || !mNestedScrolled) { + if (mNestedScrollingChildRef == null || target != mNestedScrollingChildRef.get() + || !mNestedScrolled) { return; } int top;