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

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

Merge "Don't start defaultcrypto twice" into nyc-dev

parents a9e818f4 1f992186

init/builtins.cpp

+2 −2
Original line number Diff line number Diff line
@@ -537,11 +537,11 @@ static int do_mount_all(const std::vector<std::string>& args) { 
    import_late(args, 2);



    if (ret == FS_MGR_MNTALL_DEV_NEEDS_ENCRYPTION) {

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

        ActionManager::GetInstance().QueueEventTrigger("encrypt");

    } else if (ret == FS_MGR_MNTALL_DEV_MIGHT_BE_ENCRYPTED) {

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

        property_set("ro.crypto.type", "block");

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

        ActionManager::GetInstance().QueueEventTrigger("defaultcrypto");

    } else if (ret == FS_MGR_MNTALL_DEV_NOT_ENCRYPTED) {

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

        ActionManager::GetInstance().QueueEventTrigger("nonencrypted");

rootdir/init.rc

+0 −7
Original line number Diff line number Diff line
@@ -557,13 +557,6 @@ on nonencrypted 
    class_start main

    class_start late_start



on property:vold.decrypt=trigger_default_encryption

    start defaultcrypto



on property:vold.decrypt=trigger_encryption

    start surfaceflinger

    start encrypt



on property:sys.init_log_level=*

    loglevel ${sys.init_log_level}