diff options
| author | James Lemieux <jplemieux@google.com> | 2016-02-04 13:17:59 -0800 |
|---|---|---|
| committer | James Lemieux <jplemieux@google.com> | 2016-02-04 13:17:59 -0800 |
| commit | 8633847bede6b3ae4b3d958b16fe844387e9206d (patch) | |
| tree | b7e28ac7b2541915d2adc3a927a3d735d2a3b3df | |
| parent | e5cf47c18e3588b12beb2a01b9d1d0c816e4868c (diff) | |
| download | android_packages_apps_DeskClock-8633847bede6b3ae4b3d958b16fe844387e9206d.tar.gz android_packages_apps_DeskClock-8633847bede6b3ae4b3d958b16fe844387e9206d.tar.bz2 android_packages_apps_DeskClock-8633847bede6b3ae4b3d958b16fe844387e9206d.zip | |
Avoid IndexOutOfBounds when deleting timer - DO NOT MERGE
Bug: 26902786
This fix was already made downstream; no need to merge.
Change-Id: I9cf0d983963b2ab5b900b10b28ef8e013b56081a
| -rw-r--r-- | src/com/android/deskclock/timer/TimerFragment.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/com/android/deskclock/timer/TimerFragment.java b/src/com/android/deskclock/timer/TimerFragment.java index 357751960..28a2d2e75 100644 --- a/src/com/android/deskclock/timer/TimerFragment.java +++ b/src/com/android/deskclock/timer/TimerFragment.java @@ -551,7 +551,7 @@ public class TimerFragment extends DeskClockFragment { return null; } - return mAdapter.getTimer(mViewPager.getCurrentItem()); + return mAdapter.getCount() == 0 ? null : mAdapter.getTimer(mViewPager.getCurrentItem()); } private void startUpdatingTime() { |