Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 69689a73 authored by Geremy Condra's avatar Geremy Condra
Browse files

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
parent 7c65e399

core/java/android/app/ActivityThread.java

+11 −0
Original line number Diff line number Diff line
@@ -109,6 +109,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;
@@ -4870,6 +4871,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();
@@ -4880,6 +4888,9 @@ public final class ActivityThread { 


        Environment.initForCurrentUser();



        // Set the reporter for event logging in libcore

        EventLogger.setReporter(new EventLoggingReporter());



        Security.addProvider(new AndroidKeyStoreProvider());



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