Merge "Support '-user' argument in 'adb restore' cmdline utility." am: 64871681fb am: 3292e9344f am: 98a5b95ee3 am: a80d666537

Original change: https://android-review.googlesource.com/c/platform/packages/modules/adb/+/2458917

Change-Id: I019030eaa8af47cbea799eb3daf9d8279d1b94b3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

1 files changed, 13 insertions, 2 deletions

diff --git a/client/commandline.cpp b/client/commandline.cpp
index dfe15948..5d16d649 100644
--- a/client/commandline.cpp
+++ b/client/commandline.cpp
@@ -1235,7 +1235,9 @@ static int backup(int argc, const char** argv) {
 static int restore(int argc, const char** argv) {
     fprintf(stdout, "WARNING: adb restore is deprecated and may be removed in a future release\n");
 
-    if (argc != 2) error_exit("restore requires an argument");
+    if (argc < 2) {
+        error_exit("usage: adb restore FILENAME [ARG]...");
+    }
 
     const char* filename = argv[1];
     unique_fd tarFd(adb_open(filename, O_RDONLY));
@@ -1244,8 +1246,17 @@ static int restore(int argc, const char** argv) {
         return -1;
     }
 
+    std::string cmd = "restore:";
+    argc -= 2;
+    argv += 2;
+    while (argc-- > 0) {
+        cmd += " " + escape_arg(*argv++);
+    }
+
+    D("restore. filename=%s cmd=%s", filename, cmd.c_str());
+
     std::string error;
-    unique_fd fd(adb_connect("restore:", &error));
+    unique_fd fd(adb_connect(cmd, &error));
     if (fd < 0) {
         fprintf(stderr, "adb: unable to connect for restore: %s\n", error.c_str());
         return -1;