summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDianne Hackborn <hackbod@google.com>2010-08-11 15:20:34 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2010-08-11 15:20:34 -0700
commit2d8b9fe0f9fe44c17ccc4d041f726df490548984 (patch)
treeeade681ff3d57538ddba903777362eb8a7b14db9
parent80328ba09606bd0825d7d4c9a4f213d1de09e53a (diff)
parentbd1c082cf90d07e3ccb017b72e59b5ccad81dd07 (diff)
downloadframeworks_base-2d8b9fe0f9fe44c17ccc4d041f726df490548984.zip
frameworks_base-2d8b9fe0f9fe44c17ccc4d041f726df490548984.tar.gz
frameworks_base-2d8b9fe0f9fe44c17ccc4d041f726df490548984.tar.bz2
am bd1c082c: Merge "New system property "sys.boot_completed" set to 1 when boot completed." into gingerbread
Merge commit 'bd1c082cf90d07e3ccb017b72e59b5ccad81dd07' into gingerbread-plus-aosp * commit 'bd1c082cf90d07e3ccb017b72e59b5ccad81dd07': New system property "sys.boot_completed" set to 1 when boot completed.
-rw-r--r--services/java/com/android/server/am/ActivityManagerService.java1
1 files changed, 1 insertions, 0 deletions
diff --git a/services/java/com/android/server/am/ActivityManagerService.java b/services/java/com/android/server/am/ActivityManagerService.java
index cb26769..cb0959f 100644
--- a/services/java/com/android/server/am/ActivityManagerService.java
+++ b/services/java/com/android/server/am/ActivityManagerService.java
@@ -3574,6 +3574,7 @@ public final class ActivityManagerService extends ActivityManagerNative implemen
if (mFactoryTest != SystemServer.FACTORY_TEST_LOW_LEVEL) {
// Tell anyone interested that we are done booting!
+ SystemProperties.set("sys.boot_completed", "1");
broadcastIntentLocked(null, null,
new Intent(Intent.ACTION_BOOT_COMPLETED, null),
null, null, 0, null, null,