summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Sandler <dsandler@android.com>2011-08-03 21:44:08 -0400
committerDaniel Sandler <dsandler@android.com>2011-08-03 21:45:28 -0400
commit96f3b6f0104aa1a4200c8abe69819c9c452985ab (patch)
tree8f777874ea26f25c54497d724ff363708670483b
parent271865565a5c18089853d3e9c804c941742511d3 (diff)
downloadframeworks_base-96f3b6f0104aa1a4200c8abe69819c9c452985ab.zip
frameworks_base-96f3b6f0104aa1a4200c8abe69819c9c452985ab.tar.gz
frameworks_base-96f3b6f0104aa1a4200c8abe69819c9c452985ab.tar.bz2
Fix NPE on first-ever boot if display has rotated.
Bug: 5116154 Change-Id: I8c91fa9eae24c6cb25f4431da00dc4b527124ae3
-rw-r--r--packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java2
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) {