am e1791add: Merge "add a null check around scrollAdapter access"

* commit 'e1791add1a19f1860084889188168ca32fdf3924': add a null check around scrollAdapter access
2014-03-31 18:58:46 +00:00
parent 70c5337fd1 e1791add1a
commit 65b1dad7dd
1 changed files with 2 additions and 1 deletions
--- 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;