summaryrefslogtreecommitdiffstats
path: root/content
diff options
context:
space:
mode:
authormiguelg@chromium.org <miguelg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-07-31 18:28:43 +0000
committermiguelg@chromium.org <miguelg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-07-31 18:28:43 +0000
commit8ba275f04ef1ca8d7c1e5878ea638df54c3ff18f (patch)
treeaa9c9f8d00df7aa30730dce24ed22cbbc53d8aa5 /content
parent512f48a97b576510c5a92e604772d99e49cac8cc (diff)
downloadchromium_src-8ba275f04ef1ca8d7c1e5878ea638df54c3ff18f.zip
chromium_src-8ba275f04ef1ca8d7c1e5878ea638df54c3ff18f.tar.gz
chromium_src-8ba275f04ef1ca8d7c1e5878ea638df54c3ff18f.tar.bz2
Do not crash the time picker if min/max contain illegal values.
BUG=265828 Review URL: https://chromiumcodereview.appspot.com/20987008 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@214782 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content')
-rw-r--r--content/public/android/java/src/org/chromium/content/browser/input/TimeDialog.java9
1 files changed, 7 insertions, 2 deletions
diff --git a/content/public/android/java/src/org/chromium/content/browser/input/TimeDialog.java b/content/public/android/java/src/org/chromium/content/browser/input/TimeDialog.java
index c417102..60d196f 100644
--- a/content/public/android/java/src/org/chromium/content/browser/input/TimeDialog.java
+++ b/content/public/android/java/src/org/chromium/content/browser/input/TimeDialog.java
@@ -28,8 +28,13 @@ public class TimeDialog extends TimePickerDialog {
Context context, OnTimeSetListener callBack,
int hourOfDay, int minute, boolean is24HourView, long min, long max) {
super(context, callBack, hourOfDay, minute, is24HourView);
- mMinTime = getTimeForMillis(min);
- mMaxTime = getTimeForMillis(max);
+ if (min >= max) {
+ mMinTime = getTimeForHourAndMinute(0, 0);
+ mMaxTime = getTimeForHourAndMinute(23, 59);
+ } else {
+ mMinTime = getTimeForMillis(min);
+ mMaxTime = getTimeForMillis(max);
+ }
}
@Override