Merge "Move where prop dev.bootcomplete is set"

Author: guang-google

policy/src/com/android/internal/policy/impl/PhoneWindowManager.java

@@ -3456,7 +3456,6 @@ static long[] getLongIntArray(Resources r, int resid) {
     public void systemReady() {
         // tell the keyguard
         mKeyguardMediator.onSystemReady();
-        android.os.SystemProperties.set("dev.bootcomplete", "1"); 
         synchronized (mLock) {
             updateOrientationListenerLp();
             mSystemReady = true;

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

@@ -4045,6 +4045,7 @@ public void onReceive(Context context, Intent intent) {
                 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,