diff options
| -rw-r--r-- | core/jni/AndroidRuntime.cpp | 2 | ||||
| -rw-r--r-- | core/jni/android_view_MotionEvent.cpp | 6 | ||||
| -rw-r--r-- | telecomm/java/android/telecom/Logging/EventManager.java | 2 |
3 files changed, 7 insertions, 3 deletions
diff --git a/core/jni/AndroidRuntime.cpp b/core/jni/AndroidRuntime.cpp index facc0f998bda..23d3ead44d3f 100644 --- a/core/jni/AndroidRuntime.cpp +++ b/core/jni/AndroidRuntime.cpp @@ -1094,7 +1094,7 @@ void AndroidRuntime::start(const char* className, const Vector<String8>& options * Start VM. This thread becomes the main thread of the VM, and will * not return until the VM exits. */ - char* slashClassName = toSlashClassName(className); + char* slashClassName = toSlashClassName(className != NULL ? className : ""); jclass startClass = env->FindClass(slashClassName); if (startClass == NULL) { ALOGE("JavaVM unable to locate class '%s'\n", slashClassName); diff --git a/core/jni/android_view_MotionEvent.cpp b/core/jni/android_view_MotionEvent.cpp index 0245d38144cb..f38d8e4c68be 100644 --- a/core/jni/android_view_MotionEvent.cpp +++ b/core/jni/android_view_MotionEvent.cpp @@ -345,8 +345,10 @@ static jlong android_view_MotionEvent_nativeInitialize(JNIEnv* env, jclass clazz return 0; } - MotionEvent* event = reinterpret_cast<MotionEvent*>(nativePtr); - if (!event) { + MotionEvent* event; + if (nativePtr) { + event = reinterpret_cast<MotionEvent*>(nativePtr); + } else { event = new MotionEvent(); } 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) { |