summaryrefslogtreecommitdiffstats
path: root/src/com/android
diff options
context:
space:
mode:
authorGilles Debunne <debunne@google.com>2011-07-29 11:46:56 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2011-07-29 11:46:56 -0700
commitc29e312dd6cbc15e57ca06611b69825cc334b80b (patch)
tree0a3b7426edf39d29562f817eb0fd8a87270b91f6 /src/com/android
parentbb33bdcef739c33e6bfa3ccb08c3199f073b05af (diff)
parent33ff11599553254683bbf4a5c75d5dee4251fd74 (diff)
downloadpackages_apps_settings-c29e312dd6cbc15e57ca06611b69825cc334b80b.zip
packages_apps_settings-c29e312dd6cbc15e57ca06611b69825cc334b80b.tar.gz
packages_apps_settings-c29e312dd6cbc15e57ca06611b69825cc334b80b.tar.bz2
Merge "Bug AOSP 12476: Manual time setting resets seconds to 0."
Diffstat (limited to 'src/com/android')
-rw-r--r--src/com/android/settings/DateTimeSettings.java2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/com/android/settings/DateTimeSettings.java b/src/com/android/settings/DateTimeSettings.java
index 31e6a33..3935d59 100644
--- 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) {