summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGuang Zhu <guangzhu@google.com>2012-01-12 12:02:22 -0800
committerGuang Zhu <guangzhu@google.com>2012-01-12 17:39:40 -0800
commit191713a51f0292b7fce72cc7e16cfd0f0204a0c7 (patch)
treed8fc9aae23ff85cd5f2c88d3c4ca2fad36642283
parentdc89357810976556d20483c7fe161b68ed4d2acf (diff)
downloadframeworks_base-191713a51f0292b7fce72cc7e16cfd0f0204a0c7.zip
frameworks_base-191713a51f0292b7fce72cc7e16cfd0f0204a0c7.tar.gz
frameworks_base-191713a51f0292b7fce72cc7e16cfd0f0204a0c7.tar.bz2
Move where prop dev.bootcomplete is set
Currently test harnesses depends on this flag to determine when the system is fully booted, and start dismissing keyguard, launch tests etc. However, the flag is usually set when the boot animation is still running, and typically about 5 seconds before keyguard is up etc. Moving to to when BOOT_COMPLETE broadcast is sent makes it work more reliable. We also discussed about using sys.boot_completed instead, unfortunately this flag is not in all platform and we still have backwards compatibility to maintain in order to drive unbundled tests. Change-Id: I99b084cd70d8e4bcfe490ddeca868136d32712e2
-rwxr-xr-xpolicy/src/com/android/internal/policy/impl/PhoneWindowManager.java1
-rw-r--r--services/java/com/android/server/am/ActivityManagerService.java1
2 files changed, 1 insertions, 1 deletions
diff --git a/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java b/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java
index 468f0d5..3e94ebb 100755
--- a/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java
+++ b/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java
@@ -3456,7 +3456,6 @@ public class PhoneWindowManager implements WindowManagerPolicy {
public void systemReady() {
// tell the keyguard
mKeyguardMediator.onSystemReady();
- android.os.SystemProperties.set("dev.bootcomplete", "1");
synchronized (mLock) {
updateOrientationListenerLp();
mSystemReady = true;
diff --git a/services/java/com/android/server/am/ActivityManagerService.java b/services/java/com/android/server/am/ActivityManagerService.java
index bbb4917..db0a736 100644
--- a/services/java/com/android/server/am/ActivityManagerService.java
+++ b/services/java/com/android/server/am/ActivityManagerService.java
@@ -4045,6 +4045,7 @@ public final class ActivityManagerService extends ActivityManagerNative
mHandler.sendMessageDelayed(nmsg, POWER_CHECK_DELAY);
// Tell anyone interested that we are done booting!
SystemProperties.set("sys.boot_completed", "1");
+ SystemProperties.set("dev.bootcomplete", "1");
broadcastIntentLocked(null, null,
new Intent(Intent.ACTION_BOOT_COMPLETED, null),
null, null, 0, null, null,