diff options
| author | Daniel Sandler <dsandler@google.com> | 2011-02-15 14:24:58 -0500 |
|---|---|---|
| committer | Daniel Sandler <dsandler@google.com> | 2011-02-15 14:24:58 -0500 |
| commit | bec7d63c9cad875bb127786d61ee34b4d609db59 (patch) | |
| tree | 44fd4a0a684f4935bd06757bd1cc1e745f11a7e4 /packages/SystemUI | |
| parent | a54e8725007864f8242fe5745d026e58281bd269 (diff) | |
| download | frameworks_base-bec7d63c9cad875bb127786d61ee34b4d609db59.zip frameworks_base-bec7d63c9cad875bb127786d61ee34b4d609db59.tar.gz frameworks_base-bec7d63c9cad875bb127786d61ee34b4d609db59.tar.bz2 | |
Fix NPE.
I believe this is the result of a race condition involving multiple tickers under load. The fix simply guards against the null pointer.
Bug: 3448450
Change-Id: Icc78c89890f0a41c574f7077b1b450e9fd4ca28b
Diffstat (limited to 'packages/SystemUI')
| -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; |