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

Commit 2f88ab64 authored by Eric Biggers's avatar Eric Biggers
Browse files

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

Since support for Full Disk Encryption was removed in favor of
File Based Encryption, "CryptKeeper mode" no longer exists and the
"vold.decrypt" and "vold.encrypt_progress" properties are never set.
Therefore, remove the unnecessary check for CryptKeeper mode from
ActivityManagerService::finishBooting().

Bug: 208476087
Change-Id: I1c7cb8a2dec67dda9b673de8a811229a82fee482
parent d46a6d2a

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;
@@ -5084,12 +5083,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