summaryrefslogtreecommitdiffstats
path: root/packages/SystemUI
diff options
context:
space:
mode:
authorDaniel Sandler <dsandler@android.com>2012-10-23 19:21:20 -0400
committerDaniel Sandler <dsandler@android.com>2012-10-23 19:21:20 -0400
commit1a3bdd5097e83659590895991904bbc6250cd5f2 (patch)
treee3b21450da382dfd57a087d5d84c07a63c2a42b8 /packages/SystemUI
parent8ed482224ccd9d43fbb7544379a9bb7c10554419 (diff)
downloadframeworks_base-1a3bdd5097e83659590895991904bbc6250cd5f2.zip
frameworks_base-1a3bdd5097e83659590895991904bbc6250cd5f2.tar.gz
frameworks_base-1a3bdd5097e83659590895991904bbc6250cd5f2.tar.bz2
Fix NPE.
Bug: 7401286 Change-Id: I45334c4b2263bb611952b7dd949f5df98556377d
Diffstat (limited to 'packages/SystemUI')
-rw-r--r--packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarWindowView.java4
1 files changed, 3 insertions, 1 deletions
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 9bdcf5e..f526f0c 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();
+ }
}
}