summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Hall Liu <hallliu@google.com> 2017-07-20 00:06:40 +0000
committer android-build-merger <android-build-merger@google.com> 2017-07-20 00:06:40 +0000
commitaf3d7f990ac119eecfe4fd3ec98eb04267ebe7b6 (patch)
tree5ac61fcbadf8c0884559da6ff5dcb3eb26c4ce8c
parentc6c395b6b161a4e28983f7d51e2c4b58e5422a8d (diff)
parent5af59940d17cf20174865ac0aaf52c3b4d962a64 (diff)
Merge "Add timezone for Telecom event date formatting" am: bf296640e6
am: 5af59940d1 Change-Id: I3030838f38aa9593d57f9d844d0e9553c3b76997
-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) {