Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ac28e40a authored by Paul Lawrence's avatar Paul Lawrence Committed by Android Git Automerger
Browse files

am 1623fd7d: am 3f105532: Merge "Don\'t set dev.bootcomplete until interacting... 

am 1623fd7d: am 3f105532: Merge "Don\'t set dev.bootcomplete until interacting with user" into lmp-dev

* commit '1623fd7d3075c6239d1245abfc9ca3696c1fad6c':
  Don't set dev.bootcomplete until interacting with user
parents b56ec7fc 6ab202a1

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

+6 −1
Original line number Diff line number Diff line
@@ -6316,7 +6316,12 @@ 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");













                // 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) {