commit cc34625cb76b7a4b551c1460a4f998032825410b
author Piotr Jastrzebski <haaawk@google.com> Mon Feb 16 13:06:08 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Mon Feb 16 13:06:08 2015 +0000
tree b4c8208d6c1919b6494e49a3ef0255a463bf6622
parent f6901eb9e277491c9b3dc1fcc5b1f18b1a569ae3
parent 07aaff33ef0e61dfbb15188c5aae0624dc9524a9

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

* commit '07aaff33ef0e61dfbb15188c5aae0624dc9524a9':
  Register DDM handlers at the beginning of main method.

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

diff --git a/core/java/com/android/internal/os/RuntimeInit.java b/core/java/com/android/internal/os/RuntimeInit.java
index 29ccb6a..2539a35 100644
--- a/core/java/com/android/internal/os/RuntimeInit.java
+++ b/core/java/com/android/internal/os/RuntimeInit.java
@@ -233,6 +233,7 @@
     }
 
     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 @@
     }
 
     /**
-     * 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

diff --git a/core/java/com/android/internal/os/ZygoteInit.java b/core/java/com/android/internal/os/ZygoteInit.java
index 2477d94..035b017 100644
--- a/core/java/com/android/internal/os/ZygoteInit.java
+++ b/core/java/com/android/internal/os/ZygoteInit.java
@@ -557,6 +557,7 @@
 
     public static void main(String argv[]) {
         try {
+            RuntimeInit.enableDdms();
             // Start profiling the zygote initialization.
             SamplingProfilerIntegration.start();