Download later: Fix an issue that time is not parsed correctly.

We should use Calendar.HOUR_OF_DAY to parse the time. The Android time
picker widget gives us HOUR_OF_DAY instead of Calendar.HOUR.

Bug: 1122999
Change-Id: I7b4de8b9316ed84281e2b8b3aec2fbc0b92c08cc
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2382294Reviewed-by: Min Qin <qinmin@chromium.org>
Commit-Queue: Xing Liu <xingliu@chromium.org>
Cr-Commit-Position: refs/heads/master@{#802765}

chrome/browser/download/android/java/src/org/chromium/chrome/browser/download/dialogs/DownloadDateTimePickerDialogImpl.java

@@ -67,7 +67,7 @@ public class DownloadDateTimePickerDialogImpl
                 context.getResources().getString(R.string.cancel), this::onDatePickerClicked);
 
         mTimePickerDialog = new DownloadTimePickerDialog(
-                context, this, mCalendar.get(Calendar.HOUR), mCalendar.get(Calendar.MINUTE));
+                context, this, mCalendar.get(Calendar.HOUR_OF_DAY), mCalendar.get(Calendar.MINUTE));
 
         // Start the flow.
         mDatePickerDialog.show();
@@ -112,8 +112,8 @@ public class DownloadDateTimePickerDialogImpl
 
     // DownloadTimePickerDialog.Controller overrides.
     @Override
-    public void onDownloadTimePicked(int hour, int minute) {
-        mCalendar.set(Calendar.HOUR, hour);
+    public void onDownloadTimePicked(int hourOfDay, int minute) {
+        mCalendar.set(Calendar.HOUR_OF_DAY, hourOfDay);
         mCalendar.set(Calendar.MINUTE, minute);
 
         onComplete();

chrome/browser/download/android/java/src/org/chromium/chrome/browser/download/dialogs/DownloadTimePickerDialog.java

@@ -19,11 +19,11 @@ import org.chromium.chrome.browser.download.R;
  */
 class DownloadTimePickerDialog extends TimePickerDialog {
     interface Controller {
-        void onDownloadTimePicked(int hour, int minute);
+        void onDownloadTimePicked(int hourOfDay, int minute);
         void onDownloadTimePickerCanceled();
     }
 
-    private int mHour;
+    private int mHourOfDay;
     private int mMinute;
     private final Controller mController;
 
@@ -31,7 +31,7 @@ class DownloadTimePickerDialog extends TimePickerDialog {
             Context context, @NonNull Controller controller, int hourOfDay, int minute) {
         super(context, R.style.Theme_DownloadDateTimePickerDialog, null, hourOfDay, minute,
                 false /*is24HourView*/);
-        mHour = hourOfDay;
+        mHourOfDay = hourOfDay;
         mMinute = minute;
         mController = controller;
     }
@@ -47,7 +47,7 @@ class DownloadTimePickerDialog extends TimePickerDialog {
         assert button != null;
         button.setText(R.string.download_date_time_picker_next_text);
         button.setOnClickListener((view) -> {
-            mController.onDownloadTimePicked(mHour, mMinute);
+            mController.onDownloadTimePicked(mHourOfDay, mMinute);
             dismiss();
         });
 
@@ -61,7 +61,7 @@ class DownloadTimePickerDialog extends TimePickerDialog {
 
     @Override
     public void onTimeChanged(TimePicker view, int hourOfDay, int minute) {
-        mHour = hourOfDay;
+        mHourOfDay = hourOfDay;
         mMinute = minute;
     }
 }
\ No newline at end of file