summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Hall Liu <hallliu@google.com> 2017-07-19 23:58:16 +0000
committer android-build-merger <android-build-merger@google.com> 2017-07-19 23:58:16 +0000
commit5af59940d17cf20174865ac0aaf52c3b4d962a64 (patch)
tree37c6f897c8d68c982910fc0f26d92bfc2f500262
parent3e0a8b1d2b5134ee58576efe71c7a9da1be3c192 (diff)
parentbf296640e6dfc624a9854eb634a896c819aa11c2 (diff)
Merge "Add timezone for Telecom event date formatting"
am: bf296640e6 Change-Id: Ic9db643ff6d204f75aed44160003bbe0b685eb7e
-rw-r--r--telecomm/java/android/telecom/Logging/EventManager.java2
1 files changed, 2 insertions, 0 deletions
diff --git a/telecomm/java/android/telecom/Logging/EventManager.java b/telecomm/java/android/telecom/Logging/EventManager.java
index fddbfcec001b..4fc338539f42 100644
--- a/telecomm/java/android/telecom/Logging/EventManager.java
+++ b/telecomm/java/android/telecom/Logging/EventManager.java
@@ -36,6 +36,7 @@ import java.util.LinkedList;
import java.util.List;
import java.util.Locale;
import java.util.Map;
+import java.util.TimeZone;
import java.util.concurrent.LinkedBlockingQueue;
import java.util.stream.Collectors;
@@ -268,6 +269,7 @@ public class EventManager {
public EventManager(@NonNull SessionManager.ISessionIdQueryHandler l) {
mSessionIdHandler = l;
+ sDateFormat.setTimeZone(TimeZone.getDefault());
}
public void event(Loggable recordEntry, String event, Object data) {