diff options
| author | Budi Kusmiantoro <budi@google.com> | 2015-01-09 09:40:37 -0800 |
|---|---|---|
| committer | Budi Kusmiantoro <budi@google.com> | 2015-01-09 09:40:37 -0800 |
| commit | 1b10e983caf1d1f62f57661d6247ded2b58ca5d4 (patch) | |
| tree | 3016e44793d4e3877c6b884102d0eff25881c5c4 | |
| parent | 7d8aaa98a795bcca9b50edeeee522065c12345a2 (diff) | |
| download | platform_packages_apps_DeskClock-lollipop-mr1-dev.tar.gz platform_packages_apps_DeskClock-lollipop-mr1-dev.tar.bz2 platform_packages_apps_DeskClock-lollipop-mr1-dev.zip | |
Prevent crash when multiple timers are firingandroid-5.1.1_r5android-5.1.1_r28android-5.1.1_r22android-5.1.1_r17android-5.1.1_r12lollipop-mr1-wfc-releaselollipop-mr1-dev
Bug: 18952386
Change-Id: Ib833f7c6bcda5b7fcfcea926c3d6fc2c643eb2dc
| -rw-r--r-- | src/com/android/deskclock/timer/TimerFullScreenFragment.java | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/src/com/android/deskclock/timer/TimerFullScreenFragment.java b/src/com/android/deskclock/timer/TimerFullScreenFragment.java index 01b4ed047..298272a84 100644 --- a/src/com/android/deskclock/timer/TimerFullScreenFragment.java +++ b/src/com/android/deskclock/timer/TimerFullScreenFragment.java @@ -648,9 +648,14 @@ public class TimerFullScreenFragment extends DeskClockFragment private void resetTimer(TimerObj t) { t.mState = TimerObj.STATE_RESTART; t.mTimeLeft = t.mOriginalLength = t.mSetupLength; - ((TimerListItem) t.mView).stop(); - ((TimerListItem) t.mView).setTime(t.mTimeLeft, false); - ((TimerListItem) t.mView).set(t.mOriginalLength, t.mTimeLeft, false); + + // when multiple timers are firing, some timers will be off-screen and they will not + // have Fragment instances unless user scrolls down further. t.mView is null in this case. + if (t.mView != null) { + t.mView.stop(); + t.mView.setTime(t.mTimeLeft, false); + t.mView.set(t.mOriginalLength, t.mTimeLeft, false); + } updateTimersState(t, Timers.TIMER_RESET); } |
