diff options
author | Jason Monk <jmonk@google.com> | 2014-09-08 18:39:41 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2014-09-08 18:39:41 +0000 |
commit | 907eae98881f69f8262be24a96c474fce5626be5 (patch) | |
tree | 4609d26b18c1b4a85e3b44674707a572f587c592 | |
parent | cd9300d3c0f1de36ce0a6cf95a78f899acf8ebfb (diff) | |
parent | 100d9471abcd9717046285afd9b84ca8171928eb (diff) | |
download | frameworks_base-907eae98881f69f8262be24a96c474fce5626be5.zip frameworks_base-907eae98881f69f8262be24a96c474fce5626be5.tar.gz frameworks_base-907eae98881f69f8262be24a96c474fce5626be5.tar.bz2 |
am 01ac9651: Merge "Update downtime to handle TimeZone change" into lmp-dev
* commit '01ac96519ec69af24d053c9e790068e3c51f4f57':
Update downtime to handle TimeZone change
-rw-r--r-- | services/core/java/com/android/server/notification/DowntimeConditionProvider.java | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/services/core/java/com/android/server/notification/DowntimeConditionProvider.java b/services/core/java/com/android/server/notification/DowntimeConditionProvider.java index 317ebef..b71bad8 100644 --- a/services/core/java/com/android/server/notification/DowntimeConditionProvider.java +++ b/services/core/java/com/android/server/notification/DowntimeConditionProvider.java @@ -43,6 +43,7 @@ import java.util.Calendar; import java.util.Date; import java.util.Locale; import java.util.Objects; +import java.util.TimeZone; /** Built-in zen condition provider for managing downtime */ public class DowntimeConditionProvider extends ConditionProviderService { @@ -275,6 +276,9 @@ public class DowntimeConditionProvider extends ConditionProviderService { final long schTime = intent.getLongExtra(EXTRA_TIME, 0); if (DEBUG) Slog.d(TAG, String.format("%s scheduled for %s, fired at %s, delta=%s", action, ts(schTime), ts(now), now - schTime)); + } else if (Intent.ACTION_TIMEZONE_CHANGED.equals(action)) { + if (DEBUG) Slog.d(TAG, "timezone changed to " + TimeZone.getDefault()); + mCalendar.setTimeZone(TimeZone.getDefault()); } else { if (DEBUG) Slog.d(TAG, action + " fired at " + now); } |