diff options
| author | Chris Wren <cwren@android.com> | 2014-03-31 13:36:25 -0400 |
|---|---|---|
| committer | Chris Wren <cwren@android.com> | 2014-03-31 14:47:59 -0400 |
| commit | de3b1a2b2d3056cb7caa5cdaac51fc9d80e1e3c5 (patch) | |
| tree | 8235e1401012b9811353db23d0df91de370728ff /packages | |
| parent | 8bfe0555cce1213255254d2686745077e9bd4062 (diff) | |
| download | frameworks_base-de3b1a2b2d3056cb7caa5cdaac51fc9d80e1e3c5.zip frameworks_base-de3b1a2b2d3056cb7caa5cdaac51fc9d80e1e3c5.tar.gz frameworks_base-de3b1a2b2d3056cb7caa5cdaac51fc9d80e1e3c5.tar.bz2 | |
add a null check around scrollAdapter access
Bug: 13727213
Change-Id: Ia92c06b66fc4712a758bf813c30f543b08546a80
Diffstat (limited to 'packages')
| -rw-r--r-- | packages/SystemUI/src/com/android/systemui/ExpandHelper.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/packages/SystemUI/src/com/android/systemui/ExpandHelper.java b/packages/SystemUI/src/com/android/systemui/ExpandHelper.java index b85d5b9..90b0c49 100644 --- a/packages/SystemUI/src/com/android/systemui/ExpandHelper.java +++ b/packages/SystemUI/src/com/android/systemui/ExpandHelper.java @@ -407,7 +407,8 @@ public class ExpandHelper implements Gefingerpoken, OnClickListener { } case MotionEvent.ACTION_DOWN: - mWatchingForPull = isInside(mScrollAdapter.getHostView(), x, y); + mWatchingForPull = mScrollAdapter != null && + isInside(mScrollAdapter.getHostView(), x, y); mLastMotionY = y; break; |