diff options
| author | Chris Wren <cwren@android.com> | 2014-03-31 18:59:03 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-03-31 18:59:03 +0000 |
| commit | bf430edf3eaf9d89c9914168f8262191d0b997fe (patch) | |
| tree | 67e5917d31f9cde3c1be3b015a8e204fd2ef6f7d /packages | |
| parent | 416d3cacdd21a7ef3dd89648b16d1b77926a3804 (diff) | |
| parent | e1791add1a19f1860084889188168ca32fdf3924 (diff) | |
| download | frameworks_base-bf430edf3eaf9d89c9914168f8262191d0b997fe.zip frameworks_base-bf430edf3eaf9d89c9914168f8262191d0b997fe.tar.gz frameworks_base-bf430edf3eaf9d89c9914168f8262191d0b997fe.tar.bz2 | |
am e1791add: Merge "add a null check around scrollAdapter access"
* commit 'e1791add1a19f1860084889188168ca32fdf3924':
add a null check around scrollAdapter access
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; |