Skip to content

Commit 69689a7

Browse files
committed
DO NOT MERGE Push event logging down into libcore.EventLogger
This changes the default behavior of the EventLogger from logging to the normal logs to logging to the event logs. Change-Id: I4338a1605928b82246a369adb3514bd31cd552e8 Conflicts: core/java/android/app/ActivityThread.java
1 parent 7c65e39 commit 69689a7

File tree

1 file changed

+11
-0
lines changed

1 file changed

+11
-0
lines changed

core/java/android/app/ActivityThread.java

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -109,6 +109,7 @@
109109
import java.util.TimeZone;
110110
import java.util.regex.Pattern;
111111

112+
import libcore.io.EventLogger;
112113
import libcore.io.IoUtils;
113114

114115
import dalvik.system.CloseGuard;
@@ -4870,6 +4871,13 @@ public int getIntCoreSetting(String key, int defaultValue) {
48704871
}
48714872
}
48724873

4874+
private static class EventLoggingReporter implements EventLogger.Reporter {
4875+
@Override
4876+
public void report (int code, Object... list) {
4877+
EventLog.writeEvent(code, list);
4878+
}
4879+
}
4880+
48734881
public static void main(String[] args) {
48744882
SamplingProfilerIntegration.start();
48754883

@@ -4880,6 +4888,9 @@ public static void main(String[] args) {
48804888

48814889
Environment.initForCurrentUser();
48824890

4891+
// Set the reporter for event logging in libcore
4892+
EventLogger.setReporter(new EventLoggingReporter());
4893+
48834894
Security.addProvider(new AndroidKeyStoreProvider());
48844895

48854896
Process.setArgV0("<pre-initialized>");

0 commit comments

Comments
 (0)