commit a34f1ad7c3a68d971e6332aa2fb1c16d083920b3
author Dianne Hackborn <hackbod@google.com> Wed Sep 02 13:26:28 2009 -0700
committer Dianne Hackborn <hackbod@google.com> Wed Sep 02 17:39:54 2009 -0700
tree 1bfa09439ef3130cb5dacde84fc8dce44dac1a70
parent 75f1d43b64cbf4b68ad62919a0c58907933ccd59

Fiddle system boot ordering.

This makes the system a little more careful to not start third party
code until it is ready to.

Also fix a little bug in SyncManager that would cause it to crash
during boot if sync was in a failure state.

Change-Id: Ib2d287d8441d155d393fe740a5f98690895fd358

services/java/com/android/server/am/ActivityManagerService.java

diff --git a/services/java/com/android/server/am/ActivityManagerService.java b/services/java/com/android/server/am/ActivityManagerService.java
index 8ea6699..03ebf0c 100644
--- a/services/java/com/android/server/am/ActivityManagerService.java
+++ b/services/java/com/android/server/am/ActivityManagerService.java
@@ -8188,7 +8188,7 @@
             }
         }
 
-        systemReady();
+        systemReady(null);
     }
 
     private void retrieveSettings() {
@@ -8218,7 +8218,7 @@
         return mSystemReady;
     }
     
-    public void systemReady() {
+    public void systemReady(final Runnable goingCallback) {
         // In the simulator, startRunning will never have been called, which
         // normally sets a few crucial variables. Do it here instead.
         if (!Process.supportsProcesses()) {
@@ -8228,6 +8228,7 @@
 
         synchronized(this) {
             if (mSystemReady) {
+                if (goingCallback != null) goingCallback.run();
                 return;
             }
             
@@ -8263,7 +8264,7 @@
                                     synchronized (ActivityManagerService.this) {
                                         mDidUpdate = true;
                                     }
-                                    systemReady();
+                                    systemReady(goingCallback);
                                 }
                             };
                         }
@@ -8310,7 +8311,7 @@
             }
         }
         
-        if (Config.LOGD) Log.d(TAG, "Start running!");
+        Log.i(TAG, "System now ready");
         EventLog.writeEvent(LOG_BOOT_PROGRESS_AMS_READY,
             SystemClock.uptimeMillis());
 
@@ -8352,6 +8353,8 @@
 
         retrieveSettings();
 
+        if (goingCallback != null) goingCallback.run();
+        
         synchronized (this) {
             if (mFactoryTest != SystemServer.FACTORY_TEST_LOW_LEVEL) {
                 try {