resolved conflicts for merge of c16da6aa to master

Change-Id: Ibaaf2995def15573609562162902b3d73dd78ec0
2013-04-02 10:57:10 -07:00
parent 4a5a7bd969 c16da6aa15
commit 232b4d60a6
4 changed files with 286 additions and 3 deletions
--- a/services/java/com/android/server/SystemServer.java
+++ b/services/java/com/android/server/SystemServer.java
@@ -862,6 +862,11 @@ class ServerThread extends Thread {
            public void run() {
                Slog.i(TAG, "Making services ready");

+                try {
+                    ActivityManagerService.self().startObservingNativeCrashes();
+                } catch (Throwable e) {
+                    reportWtf("observing native crashes", e);
+                }
                if (!headless) {
                    startSystemUi(contextF);
                }