diff --git a/cmds/installd/commands.c b/cmds/installd/commands.c index 1954d8dda..9c57114b4 100644 --- a/cmds/installd/commands.c +++ b/cmds/installd/commands.c @@ -1037,6 +1037,21 @@ fail: return -1; } +int mark_boot_complete(const char* instruction_set) +{ + char boot_marker_path[PKG_PATH_MAX]; + sprintf(boot_marker_path,"%s%s/.booting", DALVIK_CACHE_PREFIX, instruction_set); + + ALOGV("mark_boot_complete : %s", boot_marker_path); + if (unlink(boot_marker_path) != 0) { + ALOGE("Unable to unlink boot marker at %s, error=%s", boot_marker_path, + strerror(errno)); + return -1; + } + + return 0; +} + void mkinnerdirs(char* path, int basepos, mode_t mode, int uid, int gid, struct stat* statbuf) { diff --git a/cmds/installd/installd.c b/cmds/installd/installd.c index 933338f90..5b8a1e35e 100644 --- a/cmds/installd/installd.c +++ b/cmds/installd/installd.c @@ -42,6 +42,11 @@ static int do_dexopt(char **arg, char reply[REPLY_MAX]) return dexopt(arg[0], atoi(arg[1]), atoi(arg[2]), arg[3], arg[4], atoi(arg[5]), 0); } +static int do_mark_boot_complete(char **arg, char reply[REPLY_MAX]) +{ + return mark_boot_complete(arg[0] /* instruction set */); +} + static int do_move_dex(char **arg, char reply[REPLY_MAX]) { return move_dex(arg[0], arg[1], arg[2]); /* src, dst, instruction_set */ @@ -160,6 +165,7 @@ struct cmdinfo cmds[] = { { "ping", 0, do_ping }, { "install", 4, do_install }, { "dexopt", 6, do_dexopt }, + { "markbootcomplete", 1, do_mark_boot_complete }, { "movedex", 3, do_move_dex }, { "rmdex", 2, do_rm_dex }, { "remove", 2, do_remove }, diff --git a/cmds/installd/installd.h b/cmds/installd/installd.h index 36c3e8c3f..a3a5c1628 100644 --- a/cmds/installd/installd.h +++ b/cmds/installd/installd.h @@ -221,6 +221,7 @@ int get_size(const char *pkgname, userid_t userid, const char *apkpath, const ch int free_cache(int64_t free_size); int dexopt(const char *apk_path, uid_t uid, bool is_public, const char *pkgName, const char *instruction_set, bool vm_safe_mode, bool should_relocate); +int mark_boot_complete(const char *instruction_set); int movefiles(); int linklib(const char* target, const char* source, int userId); int idmap(const char *target_path, const char *overlay_path, uid_t uid);