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

* commit '4fed68a2b1c7d35f421d8eee672138e55b769d86': Fix NPE.
2012-10-23 16:32:37 -07:00
parent 4a82a0fc09 4fed68a2b1
commit b68a3a47ef
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();
+        }
    }
 }