diff options
| author | Hiroshi Lockheimer <hiroshi@google.com> | 2012-10-23 16:29:14 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-10-23 16:29:14 -0700 |
| commit | 4fed68a2b1c7d35f421d8eee672138e55b769d86 (patch) | |
| tree | dc0b81c6d4459a41778e23db8d0f4ac0cad1ed79 | |
| parent | f5fa64f24b0ee6aa53ac2803590e8729122c445b (diff) | |
| parent | c63aa9621821b3f1e32292362cce76cd1899d932 (diff) | |
| download | frameworks_base-4fed68a2b1c7d35f421d8eee672138e55b769d86.zip frameworks_base-4fed68a2b1c7d35f421d8eee672138e55b769d86.tar.gz frameworks_base-4fed68a2b1c7d35f421d8eee672138e55b769d86.tar.bz2 | |
am c63aa962: Merge "Fix NPE." into jb-mr1-dev
* commit 'c63aa9621821b3f1e32292362cce76cd1899d932':
Fix NPE.
| -rw-r--r-- | packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarWindowView.java | 4 |
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(); + } } } |