am c63aa962: Merge "Fix NPE." into jb-mr1-dev

* commit 'c63aa9621821b3f1e32292362cce76cd1899d932': Fix NPE.
2012-10-23 16:29:14 -07:00
parent f5fa64f24b c63aa96218
commit 4fed68a2b1
1 changed files with 3 additions and 1 deletions
--- 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();
+        }
    }
 }