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

Commit da8ccc7c authored by Paul Lawrence's avatar Paul Lawrence Committed by The Android Automerger
Browse files

Don't set dev.bootcomplete until interacting with user 

Specifically we want to not set it when encrypting and showing
progress.

Bug: 17606949
Change-Id: I668cf47781011e7fcea7aa3b43c7783b3dea77a1
parent 86b36946

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