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

Commit a005e779 authored by Paul Lawrence's avatar Paul Lawrence Committed by Android (Google) Code Review
Browse files

Merge "Enable not rebooting during default encryption" into lmp-dev

parents 4089cda0 c23074f3

init/builtins.c

+0 −1
Original line number Diff line number Diff line
@@ -537,7 +537,6 @@ int do_mount_all(int nargs, char **args) 
    }



    if (ret == FS_MGR_MNTALL_DEV_NEEDS_ENCRYPTION) {

        property_set("ro.crypto.state", "unencrypted");

        property_set("vold.decrypt", "trigger_encryption");

    } else if (ret == FS_MGR_MNTALL_DEV_MIGHT_BE_ENCRYPTED) {

        property_set("ro.crypto.state", "encrypted");

rootdir/init.rc

+0 −1
Original line number Diff line number Diff line
@@ -429,7 +429,6 @@ on property:vold.decrypt=trigger_default_encryption 
on property:vold.decrypt=trigger_encryption

    start surfaceflinger

    start encrypt

    class_start main



on property:sys.init_log_level=*

    loglevel ${sys.init_log_level}