diff options
| author | Jeff Sharkey <jsharkey@android.com> | 2015-05-01 16:45:50 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-05-01 16:45:50 +0000 |
| commit | 2a797d3ca5d69bc14ddab9dc72f3cb9fb2efd983 (patch) | |
| tree | 95904e01019ae28435c784114751fd194f2f1fb2 /cmds/installd/installd.cpp | |
| parent | 78361958009b90ecd477b0b3f8defe7bfd1bee90 (diff) | |
| parent | 61a3c8dec90acebef15ef56cae14efea69279f69 (diff) | |
| download | frameworks_native-2a797d3ca5d69bc14ddab9dc72f3cb9fb2efd983.zip frameworks_native-2a797d3ca5d69bc14ddab9dc72f3cb9fb2efd983.tar.gz frameworks_native-2a797d3ca5d69bc14ddab9dc72f3cb9fb2efd983.tar.bz2 | |
am 61a3c8de: Merge "Offer to move both code and data together." into mnc-dev
* commit '61a3c8dec90acebef15ef56cae14efea69279f69':
Offer to move both code and data together.
Diffstat (limited to 'cmds/installd/installd.cpp')
| -rw-r--r-- | cmds/installd/installd.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/cmds/installd/installd.cpp b/cmds/installd/installd.cpp index 3a86181..01e7cdd 100644 --- a/cmds/installd/installd.cpp +++ b/cmds/installd/installd.cpp @@ -124,10 +124,10 @@ static int do_rm_user_data(char **arg, char reply[REPLY_MAX] __unused) return delete_user_data(parse_null(arg[0]), arg[1], atoi(arg[2])); /* uuid, pkgname, userid */ } -static int do_mv_user_data(char **arg, char reply[REPLY_MAX] __unused) +static int do_mv_complete_app(char **arg, char reply[REPLY_MAX] __unused) { - // from_uuid, to_uuid, pkgname, appid, seinfo - return move_user_data(parse_null(arg[0]), parse_null(arg[1]), arg[2], atoi(arg[3]), arg[4]); + // from_uuid, to_uuid, package_name, data_app_name, appid, seinfo + return move_complete_app(parse_null(arg[0]), parse_null(arg[1]), arg[2], arg[3], atoi(arg[4]), arg[5]); } static int do_mk_user_data(char **arg, char reply[REPLY_MAX] __unused) @@ -200,7 +200,7 @@ struct cmdinfo cmds[] = { { "rmcodecache", 3, do_rm_code_cache }, { "getsize", 8, do_get_size }, { "rmuserdata", 3, do_rm_user_data }, - { "mvuserdata", 5, do_mv_user_data }, + { "mvcompleteapp", 6, do_mv_complete_app }, { "movefiles", 0, do_movefiles }, { "linklib", 4, do_linklib }, { "mkuserdata", 5, do_mk_user_data }, |