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

Commit d1328e6c authored by Tom Cherry's avatar Tom Cherry Committed by android-build-merger
Browse files

Merge "Make init builtin command installkey respect property updates" am:... 

Merge "Make init builtin command installkey respect property updates" am: cf29755e am: e58af94b am: 32d30011
am: 1b871554

Change-Id: Ie318a962c36498d4870601223660053e0415612f
parents 9293f322 1b871554

init/builtins.cpp

+8 −2
Original line number Diff line number Diff line
@@ -919,8 +919,14 @@ static int do_installkey(const std::vector<std::string>& args) { 
    if (!is_file_crypto()) {

        return 0;

    }

    return e4crypt_create_device_key(args[1].c_str(),

                                     do_installkeys_ensure_dir_exists);

    auto unencrypted_dir = args[1] + e4crypt_unencrypted_folder;

    if (do_installkeys_ensure_dir_exists(unencrypted_dir.c_str())) {

        PLOG(ERROR) << "Failed to create " << unencrypted_dir;

        return -1;

    }

    std::vector<std::string> exec_args = {"exec", "/system/bin/vdc", "--wait", "cryptfs",

                                          "enablefilecrypto"};

    return do_exec(exec_args);

}



static int do_init_user0(const std::vector<std::string>& args) {