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

Commit 07aaff33 authored by Piotr Jastrzebski's avatar Piotr Jastrzebski Committed by Android Git Automerger
Browse files

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

* commit '58524b2a':
  Register DDM handlers at the beginning of main method.
parents 32acf753 58524b2a

core/java/com/android/internal/os/RuntimeInit.java

+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();

    }

core/java/com/android/internal/os/ZygoteInit.java

+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();