commit 3cedef53ce8dbebb4bfabc5909914bd270629540
author Paul Lawrence <paullawrence@google.com> Fri Sep 26 17:58:25 2014 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Sep 26 17:58:26 2014 +0000
tree f6e727f69e5b5538f91be12639d6d7439b710365
parent e51b21a81ef786526d9fe79af7073808ddb0bbbf
parent 95cce9f382693ad13039d1a1fb15529017a20929

Merge "Don't set dev.bootcomplete until interacting with user" into lmp-dev

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

diff --git a/services/core/java/com/android/server/am/ActivityManagerService.java b/services/core/java/com/android/server/am/ActivityManagerService.java
index 4d2fd4c..f535791 100755
--- a/services/core/java/com/android/server/am/ActivityManagerService.java
+++ b/services/core/java/com/android/server/am/ActivityManagerService.java
@@ -6316,7 +6316,12 @@
                 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");
+
+                // And trigger dev.bootcomplete if we are not showing encryption progress
+                if (!"trigger_restart_min_framework".equals(SystemProperties.get("vold.decrypt"))
+                    || "".equals(SystemProperties.get("vold.encrypt_progress"))) {
+                    SystemProperties.set("dev.bootcomplete", "1");
+                }
                 for (int i=0; i<mStartedUsers.size(); i++) {
                     UserStartedState uss = mStartedUsers.valueAt(i);
                     if (uss.mState == UserStartedState.STATE_BOOTING) {