Merge "Fix NPE."

2011-02-16 11:32:39 -08:00
parent d33a4ccb5c bec7d63c9c
commit 439f5c6b39
1 changed files with 3 additions and 1 deletions
--- a/packages/SystemUI/src/com/android/systemui/statusbar/tablet/TabletTicker.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/tablet/TabletTicker.java
@@ -158,7 +158,9 @@ public class TabletTicker
    private void advance() {
        // Out with the old...
        if (mCurrentView != null) {
-            mWindow.removeView(mCurrentView);
+            if (mWindow != null) {
+                mWindow.removeView(mCurrentView);
+            }
            mCurrentView = null;
            mCurrentKey = null;
            mCurrentNotification = null;