From de3b1a2b2d3056cb7caa5cdaac51fc9d80e1e3c5 Mon Sep 17 00:00:00 2001
From: Chris Wren <cwren@android.com>
Date: Mon, 31 Mar 2014 13:36:25 -0400
Subject: [PATCH] add a null check around scrollAdapter access

Bug: 13727213
Change-Id: Ia92c06b66fc4712a758bf813c30f543b08546a80
---
 packages/SystemUI/src/com/android/systemui/ExpandHelper.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/packages/SystemUI/src/com/android/systemui/ExpandHelper.java b/packages/SystemUI/src/com/android/systemui/ExpandHelper.java
index b85d5b93f61db..90b0c490f86e9 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;