summaryrefslogtreecommitdiffstats
path: root/services/java/com/android/server/status
diff options
context:
space:
mode:
authorJoe Onorato <joeo@android.com>2010-01-11 20:15:26 -0500
committerJoe Onorato <joeo@android.com>2010-01-11 20:15:46 -0500
commitf523609e8db372add763424c73f77d926865bb50 (patch)
tree66bd91b2bec18271afb39ddef7969659f85407ae /services/java/com/android/server/status
parent58f24686dcfbc0ec9cac42a49b167a2f194389ed (diff)
downloadframeworks_base-f523609e8db372add763424c73f77d926865bb50.zip
frameworks_base-f523609e8db372add763424c73f77d926865bb50.tar.gz
frameworks_base-f523609e8db372add763424c73f77d926865bb50.tar.bz2
stop crashing. I'm not sure what triggered this.
Diffstat (limited to 'services/java/com/android/server/status')
-rw-r--r--services/java/com/android/server/status/StatusBarService.java8
1 files changed, 6 insertions, 2 deletions
diff --git a/services/java/com/android/server/status/StatusBarService.java b/services/java/com/android/server/status/StatusBarService.java
index 0a731a8..2d0f254 100644
--- a/services/java/com/android/server/status/StatusBarService.java
+++ b/services/java/com/android/server/status/StatusBarService.java
@@ -1496,6 +1496,7 @@ public class StatusBarService extends IStatusBar.Stub
// lp.token = mStatusBarView.getWindowToken();
lp.gravity = Gravity.TOP | Gravity.FILL_HORIZONTAL;
lp.setTitle("TrackingView");
+ lp.y = mTrackingPosition;
mTrackingParams = lp;
WindowManagerImpl.getDefault().addView(mTrackingView, lp);
@@ -1575,8 +1576,11 @@ public class StatusBarService extends IStatusBar.Stub
// Maybe the view was resized.
if (!mExpandedVisible) {
if (mTrackingView != null) {
- mTrackingPosition = mTrackingParams.y = -disph;
- WindowManagerImpl.getDefault().updateViewLayout(mTrackingView, mTrackingParams);
+ mTrackingPosition = -disph;
+ if (mTrackingParams != null) {
+ mTrackingParams.y = mTrackingPosition;
+ WindowManagerImpl.getDefault().updateViewLayout(mTrackingView, mTrackingParams);
+ }
}
if (mExpandedParams != null) {
mExpandedParams.y = -disph;