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

Commit 58524b2a authored by Piotr Jastrzebski's avatar Piotr Jastrzebski Committed by Android Git Automerger
Browse files

am e7e92381: Merge "Register DDM handlers at the beginning of main method."

* commit 'e7e92381':
  Register DDM handlers at the beginning of main method.
parents 83c804be e7e92381
Loading
Loading
Loading
Loading
+3 −2
Original line number Diff line number Diff line
@@ -233,6 +233,7 @@ public class RuntimeInit {
    }

    public static final void main(String[] argv) {
        enableDdms();
        if (argv.length == 2 && argv[1].equals("application")) {
            if (DEBUG) Slog.d(TAG, "RuntimeInit: Starting application");
            redirectLogStreams();
@@ -365,9 +366,9 @@ public class RuntimeInit {
    }

    /**
     * Enable debugging features.
     * Enable DDMS.
     */
    static {
    static final void enableDdms() {
        // Register handlers for DDM messages.
        android.ddm.DdmRegister.registerHandlers();
    }
+1 −0
Original line number Diff line number Diff line
@@ -557,6 +557,7 @@ public class ZygoteInit {

    public static void main(String argv[]) {
        try {
            RuntimeInit.enableDdms();
            // Start profiling the zygote initialization.
            SamplingProfilerIntegration.start();