diff options
| author | Chris Wren <cwren@android.com> | 2014-03-31 18:53:34 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-03-31 18:53:34 +0000 |
| commit | e1791add1a19f1860084889188168ca32fdf3924 (patch) | |
| tree | 9c4274f5bb6db2bf73ca66df5659ccb60aa0d2f6 /packages | |
| parent | 47bbaea4c3f5dee97f2e1c56c6cc9957efa17eaf (diff) | |
| parent | de3b1a2b2d3056cb7caa5cdaac51fc9d80e1e3c5 (diff) | |
| download | frameworks_base-e1791add1a19f1860084889188168ca32fdf3924.zip frameworks_base-e1791add1a19f1860084889188168ca32fdf3924.tar.gz frameworks_base-e1791add1a19f1860084889188168ca32fdf3924.tar.bz2 | |
Merge "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; |