merge in lmp-mr1-release history after reset to lmp-mr1-dev
diff --git a/src/com/android/deskclock/timer/TimerFullScreenFragment.java b/src/com/android/deskclock/timer/TimerFullScreenFragment.java
index 01b4ed0..298272a 100644
--- a/src/com/android/deskclock/timer/TimerFullScreenFragment.java
+++ b/src/com/android/deskclock/timer/TimerFullScreenFragment.java
@@ -648,9 +648,14 @@
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);
}
