diff options
| author | 2012-01-12 21:00:15 -0800 | |
|---|---|---|
| committer | 2012-01-12 21:00:15 -0800 | |
| commit | 6a78cd85867c5f22e4e82259b81fab46088331ad (patch) | |
| tree | b03aaf430edb7350e4fa881578b876b752a8e8d3 | |
| parent | 73f22cd4306bfc640b7d7656732e1c26e83a0895 (diff) | |
| parent | 191713a51f0292b7fce72cc7e16cfd0f0204a0c7 (diff) | |
Merge "Move where prop dev.bootcomplete is set"
| -rwxr-xr-x | policy/src/com/android/internal/policy/impl/PhoneWindowManager.java | 1 | ||||
| -rw-r--r-- | services/java/com/android/server/am/ActivityManagerService.java | 1 |
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 468f0d5b83e0..3e94ebbbaf34 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 bbb4917fbab2..db0a736dfefa 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, |