diff options
| author | Daniel Sandler <dsandler@google.com> | 2011-02-16 11:32:39 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-02-16 11:32:39 -0800 |
| commit | 439f5c6b39fe648da835d4c86dfcffed0f46dd94 (patch) | |
| tree | 106ea2a0601182170d525c2634ad6584644a7cd3 /packages | |
| parent | d33a4ccb5c3b58406cee45a4d933d40219177f8c (diff) | |
| parent | bec7d63c9cad875bb127786d61ee34b4d609db59 (diff) | |
| download | frameworks_base-439f5c6b39fe648da835d4c86dfcffed0f46dd94.zip frameworks_base-439f5c6b39fe648da835d4c86dfcffed0f46dd94.tar.gz frameworks_base-439f5c6b39fe648da835d4c86dfcffed0f46dd94.tar.bz2 | |
Merge "Fix NPE."
Diffstat (limited to 'packages')
| -rw-r--r-- | packages/SystemUI/src/com/android/systemui/statusbar/tablet/TabletTicker.java | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/tablet/TabletTicker.java b/packages/SystemUI/src/com/android/systemui/statusbar/tablet/TabletTicker.java index a072aed..a8f4262 100644 --- 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; |