diff options
| author | Daniel Sandler <dsandler@google.com> | 2011-08-04 19:15:49 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-08-04 19:15:49 -0700 |
| commit | f35ed373214d2bc450ea490e87a41af1acb3ed95 (patch) | |
| tree | 06ea1d7a31dad770afc4ad41ba5d58b2b7447066 /packages | |
| parent | ca0c1a3c516c8485e0ab3255520c68e064a92fc4 (diff) | |
| parent | f48fd822e055da272f9e821db56db98591a35cfe (diff) | |
| download | frameworks_base-f35ed373214d2bc450ea490e87a41af1acb3ed95.zip frameworks_base-f35ed373214d2bc450ea490e87a41af1acb3ed95.tar.gz frameworks_base-f35ed373214d2bc450ea490e87a41af1acb3ed95.tar.bz2 | |
Merge "Fix another NPE."
Diffstat (limited to 'packages')
| -rw-r--r-- | packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java index 25eab26..228f285 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java @@ -1873,7 +1873,7 @@ public class PhoneStatusBar extends StatusBar { } void updateExpandedSize() { - if (mExpandedDialog != null && mExpandedParams != null) { + if (mExpandedDialog != null && mExpandedParams != null && mDisplaySize != null) { mExpandedParams.width = mDisplaySize.x; mExpandedParams.height = getExpandedHeight(mDisplaySize.y); if (!mExpandedVisible) { |