diff options
| author | Daniel Sandler <dsandler@android.com> | 2011-08-04 08:46:20 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-08-04 08:46:20 -0700 |
| commit | f91f0905e43e9e264348adb5d3d5f18a8777ff55 (patch) | |
| tree | 8071a5358631a16aded0d06cf0f4a89b61cf8381 /packages/SystemUI | |
| parent | 8d77e7714bce81305958c7003b531de32e941d74 (diff) | |
| parent | 96f3b6f0104aa1a4200c8abe69819c9c452985ab (diff) | |
| download | frameworks_base-f91f0905e43e9e264348adb5d3d5f18a8777ff55.zip frameworks_base-f91f0905e43e9e264348adb5d3d5f18a8777ff55.tar.gz frameworks_base-f91f0905e43e9e264348adb5d3d5f18a8777ff55.tar.bz2 | |
Merge "Fix NPE on first-ever boot if display has rotated."
Diffstat (limited to 'packages/SystemUI')
| -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 7bb8277..25eab26 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) { + if (mExpandedDialog != null && mExpandedParams != null) { mExpandedParams.width = mDisplaySize.x; mExpandedParams.height = getExpandedHeight(mDisplaySize.y); if (!mExpandedVisible) { |