diff --git a/core/java/android/app/ActivityThread.java b/core/java/android/app/ActivityThread.java index 09fa99cb5b477..4c5f7ac89d4bb 100644 --- a/core/java/android/app/ActivityThread.java +++ b/core/java/android/app/ActivityThread.java @@ -108,6 +108,7 @@ import java.util.Map; import java.util.TimeZone; import java.util.regex.Pattern; +import libcore.io.EventLogger; import libcore.io.IoUtils; import dalvik.system.CloseGuard; @@ -4869,6 +4870,13 @@ public final class ActivityThread { } } + private static class EventLoggingReporter implements EventLogger.Reporter { + @Override + public void report (int code, Object... list) { + EventLog.writeEvent(code, list); + } + } + public static void main(String[] args) { SamplingProfilerIntegration.start(); @@ -4877,6 +4885,9 @@ public final class ActivityThread { // StrictMode) on debug builds, but using DropBox, not logs. CloseGuard.setEnabled(false); + // Set the reporter for event logging in libcore + EventLogger.setReporter(new EventLoggingReporter()); + Security.addProvider(new AndroidKeyStoreProvider()); Process.setArgV0("");