From 1a3bdd5097e83659590895991904bbc6250cd5f2 Mon Sep 17 00:00:00 2001
From: Daniel Sandler <dsandler@android.com>
Date: Tue, 23 Oct 2012 19:21:20 -0400
Subject: [PATCH] Fix NPE.

Bug: 7401286
Change-Id: I45334c4b2263bb611952b7dd949f5df98556377d
---
 .../android/systemui/statusbar/phone/StatusBarWindowView.java | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarWindowView.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarWindowView.java
index 9bdcf5eb0dc87..f526f0c6f988e 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarWindowView.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarWindowView.java
@@ -121,7 +121,9 @@ public class StatusBarWindowView extends FrameLayout
     }
 
     public void cancelExpandHelper() {
-        mExpandHelper.cancel();
+        if (mExpandHelper != null) {
+            mExpandHelper.cancel();
+        }
     }
 }