Merge "Bug AOSP 12476: Manual time setting resets seconds to 0."

2011-07-29 11:46:56 -07:00
parent bb33bdcef7 33ff115995
commit c29e312dd6
1 changed files with 2 additions and 0 deletions
--- a/src/com/android/settings/DateTimeSettings.java
+++ b/src/com/android/settings/DateTimeSettings.java
@@ -354,6 +354,8 @@ public class DateTimeSettings extends SettingsPreferenceFragment

        c.set(Calendar.HOUR_OF_DAY, hourOfDay);
        c.set(Calendar.MINUTE, minute);
+        c.set(Calendar.SECOND, 0);
+        c.set(Calendar.MILLISECOND, 0);
        long when = c.getTimeInMillis();

        if (when / 1000 < Integer.MAX_VALUE) {