Commit: fb989b4313f6d5ce40376fe8165ba5e7f5e137d5 - system-coremmmm (git)

system/corennnnn

Commit MetaInfo

• Revision: fb989b4313f6d5ce40376fe8165ba5e7f5e137d5 (tree)
• Time: 2016-07-20 18:01:29
• Author: Leo Sartre <leox.sartre@inte...>
• Commiter: Chih-Wei Huang

Log Message

adb host: add device state in "adb wait-for-*"

The current implementation of the host commands "adb wait-for-*" allows
to specify only the transport layer (local, usb or any).
This patch allows the specification of the expected device state
(bootloader, recovery, device or sideload), this is usefull for
scripting purposes.

Use case:
$ adb reboot sideload-auto-reboot
$ adb wait-for-usb-sideload && adb sideload package.zip

This is a port of: https://android-review.googlesource.com/#/c/184290

Change-Id: I56a64b2d0f089cf1eb77424956296d660132b629
Signed-off-by: Leo Sartre <[e-mail]>
Tracked-On: https://jira01.devtools.intel.com/browse/OAM-15622
Reviewed-on: https://android.intel.com:443/450503

Change Summary

• modified: adb/commandline.cpp
• modified: adb/services.cpp

Incremental Difference

--- a/adb/commandline.cpp
+++ b/adb/commandline.cpp
@@ -198,7 +198,10 @@ static void help() {
         "  adb version                  - show version num\n"
         "\n"
         "scripting:\n"
-        "  adb wait-for-device          - block until device is online\n"
+        "  adb wait-for-<transport>-<state>\n"
+        "                               - wait for device to be in the given state:\n"
+        "                                 device, recovery, sideload, or bootloader\n"
+        "                                 Transport is: usb, local or any\n"
         "  adb start-server             - ensure that there is a server running\n"
         "  adb kill-server              - kill the server if it is running\n"
         "  adb get-state                - prints: offline | bootloader | device\n"
@@ -674,19 +677,49 @@ static int ppp(int argc, const char** argv) {
 #endif /* !defined(_WIN32) */
 }
 
+static bool check_wait_for_device_syntax(const char* service) {
+    // TODO: when we have libc++ for Windows, use a regular expression instead.
+    // wait-for-((any|local|usb)-)?(bootloader|device|recovery|sideload)
+
+    char type[20];
+    char state[20];
+    int length = 0;
+    if (sscanf(service, "wait-for-%20[a-z]-%20[a-z]%n", type, state, &length) < 2 ||
+        length != static_cast<int>(strlen(service))) {
+        fprintf(stderr, "adb: couldn't parse 'wait-for' command: %s\n", service);
+        return false;
+    }
+
+    if (strcmp(type, "any") != 0 && strcmp(type, "local") != 0 && strcmp(type, "usb") != 0) {
+        fprintf(stderr, "adb: unknown type %s; expected 'any', 'local', or 'usb'\n", type);
+        return false;
+    }
+    if (strcmp(state, "bootloader") != 0 && strcmp(state, "device") != 0 &&
+        strcmp(state, "recovery") != 0 && strcmp(state, "sideload") != 0) {
+        fprintf(stderr, "adb: unknown state %s; "
+                        "expected 'bootloader', 'device', 'recovery', or 'sideload'\n", state);
+        return false;
+    }
+    return true;
+}
+
 static bool wait_for_device(const char* service, transport_type t, const char* serial) {
     // Was the caller vague about what they'd like us to wait for?
     // If so, check they weren't more specific in their choice of transport type.
     if (strcmp(service, "wait-for-device") == 0) {
         if (t == kTransportUsb) {
-            service = "wait-for-usb";
+            service = "wait-for-usb-device";
         } else if (t == kTransportLocal) {
-            service = "wait-for-local";
+            service = "wait-for-local-device";
         } else {
-            service = "wait-for-any";
+            service = "wait-for-any-device";
         }
     }
 
+    if (!check_wait_for_device_syntax(service)) {
+        return false;
+    }
+
     std::string cmd = format_host_command(service, t, serial);
     std::string error;
     if (adb_command(cmd, &error)) {

--- a/adb/services.cpp
+++ b/adb/services.cpp
@@ -649,11 +649,13 @@ asocket*  host_service_to_socket(const char*  name, const char *serial)
 {
     if (!strcmp(name,"track-devices")) {
         return create_device_tracker();
-    } else if (!strncmp(name, "wait-for-", strlen("wait-for-"))) {
-        auto sinfo = reinterpret_cast<state_info*>(malloc(sizeof(state_info)));
+    } else if (android::base::StartsWith(name, "wait-for-")) {
+        name += strlen("wait-for-");
+
+        std::unique_ptr<state_info> sinfo(new state_info);
         if (sinfo == nullptr) {
             fprintf(stderr, "couldn't allocate state_info: %s", strerror(errno));
-            return NULL;
+            return nullptr;
         }
 
         if (serial)
@@ -661,29 +663,38 @@ asocket*  host_service_to_socket(const char*  name, const char *serial)
         else
             sinfo->serial = NULL;
 
-        name += strlen("wait-for-");
-
-        if (!strncmp(name, "local", strlen("local"))) {
+        if (android::base::StartsWith(name, "local")) {
+            name += strlen("local");
             sinfo->transport = kTransportLocal;
-            sinfo->state = CS_DEVICE;
-        } else if (!strncmp(name, "usb", strlen("usb"))) {
+        } else if (android::base::StartsWith(name, "usb")) {
+            name += strlen("usb");
             sinfo->transport = kTransportUsb;
-            sinfo->state = CS_DEVICE;
-        } else if (!strncmp(name, "any", strlen("any"))) {
+        } else if (android::base::StartsWith(name, "any")) {
+            name += strlen("any");
             sinfo->transport = kTransportAny;
+        } else {
+            return nullptr;
+        }
+
+        if (!strcmp(name, "-device")) {
             sinfo->state = CS_DEVICE;
+        } else if (!strcmp(name, "-recovery")) {
+            sinfo->state = CS_RECOVERY;
+        } else if (!strcmp(name, "-sideload")) {
+            sinfo->state = CS_SIDELOAD;
+        } else if (!strcmp(name, "-bootloader")) {
+            sinfo->state = CS_BOOTLOADER;
         } else {
-            free(sinfo);
-            return NULL;
+            return nullptr;
         }
 
-        int fd = create_service_thread(wait_for_state, sinfo);
+        int fd = create_service_thread(wait_for_state, sinfo.release());
         return create_local_socket(fd);
     } else if (!strncmp(name, "connect:", 8)) {
         const char *host = name + 8;
         int fd = create_service_thread(connect_service, (void *)host);
         return create_local_socket(fd);
     }
-    return NULL;
+    return nullptr;
 }
 #endif /* ADB_HOST */