diff options
| author | Hiroshi Lockheimer <hiroshi@google.com> | 2012-10-23 16:32:37 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-10-23 16:32:37 -0700 |
| commit | b68a3a47eff1f61322f3f65d1f9e89753676d8e7 (patch) | |
| tree | 31058ef38c99fc395ff53bb4d726100140fed322 | |
| parent | 4a82a0fc09f4743b59b5de483329fb76e60aab07 (diff) | |
| parent | 4fed68a2b1c7d35f421d8eee672138e55b769d86 (diff) | |
| download | frameworks_base-b68a3a47eff1f61322f3f65d1f9e89753676d8e7.zip frameworks_base-b68a3a47eff1f61322f3f65d1f9e89753676d8e7.tar.gz frameworks_base-b68a3a47eff1f61322f3f65d1f9e89753676d8e7.tar.bz2 | |
am 4fed68a2: am c63aa962: Merge "Fix NPE." into jb-mr1-dev
* commit '4fed68a2b1c7d35f421d8eee672138e55b769d86':
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(); + } } } |