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

Commit 605c19ec authored by Eric Biggers's avatar Eric Biggers Committed by Android (Google) Code Review
Browse files

Merge "AMS: stop checking for CryptKeeper mode before setting dev.bootcomplete"

parents 6da03016 2f88ab64

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

+1 −7
Original line number Diff line number Diff line
@@ -308,7 +308,6 @@ import android.provider.DeviceConfig; 
import android.provider.Settings;

import android.server.ServerProtoEnums;

import android.sysprop.InitProperties;

import android.sysprop.VoldProperties;

import android.telephony.TelephonyManager;

import android.text.TextUtils;

import android.text.style.SuggestionSpan;
@@ -5071,12 +5070,7 @@ public class ActivityManagerService extends IActivityManager.Stub 
            }

            // 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(VoldProperties.decrypt().orElse(""))













                    || "".equals(VoldProperties.encrypt_progress().orElse(""))) {















            SystemProperties.set("dev.bootcomplete", "1");













            }















            mUserController.sendBootCompleted(















                    new IIntentReceiver.Stub() {















                        @Override