コミット: 59ec200272072a54e19fdb448a6e8f355f269bb6 - system-core (git)

system/core

コミットメタ情報

• リビジョン: 59ec200272072a54e19fdb448a6e8f355f269bb6 (tree)
• 日時: 2016-09-12 05:53:41
• 作者: Steve Kondik <steve@cyng...>
• コミッター: Steve Kondik

ログメッセージ

adb: Add wait-for-online command

• Add the pseudo-state "online" which means either "device" or
  "recovery". This is used by our tooling.
  

Change-Id: I92034c477d28f847e24ec72bbb87b252fba875e1

変更サマリ

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

差分

--- a/adb/adb.h
+++ b/adb/adb.h
@@ -114,6 +114,7 @@ enum ConnectionState {
     kCsNoPerm,  // Insufficient permissions to communicate with the device.
     kCsSideload,
     kCsUnauthorized,
+    kCsOnline,
 };
 
 /* A listener is an entity which binds to a local port

--- a/adb/commandline.cpp
+++ b/adb/commandline.cpp
@@ -209,7 +209,7 @@ static void help() {
         "scripting:\n"
         "  adb wait-for[-<transport>]-<state>\n"
         "                               - wait for device to be in the given state:\n"
-        "                                 device, recovery, sideload, or bootloader\n"
+        "                                 device, recovery, sideload, online, or bootloader\n"
         "                                 Transport is: usb, local or any [default=any]\n"
         "  adb start-server             - ensure that there is a server running\n"
         "  adb kill-server              - kill the server if it is running\n"
@@ -1083,10 +1083,10 @@ static bool wait_for_device(const char* service, TransportType t, const char* se
     }
 
     if (components[3] != "any" && components[3] != "bootloader" && components[3] != "device" &&
-        components[3] != "recovery" && components[3] != "sideload") {
+        components[3] != "recovery" && components[3] != "sideload" && components[3] != "online") {
         fprintf(stderr,
                 "adb: unknown state %s; "
-                "expected 'any', 'bootloader', 'device', 'recovery', or 'sideload'\n",
+                "expected 'any', 'bootloader', 'device', 'recovery', 'online', or 'sideload'\n",
                 components[3].c_str());
         return false;
     }

--- a/adb/services.cpp
+++ b/adb/services.cpp
@@ -391,7 +391,9 @@ static void wait_for_state(int fd, void* data) {
         std::string error = "unknown error";
         const char* serial = sinfo->serial.length() ? sinfo->serial.c_str() : NULL;
         atransport* t = acquire_one_transport(sinfo->transport_type, serial, &is_ambiguous, &error);
-        if (t != nullptr && (sinfo->state == kCsAny || sinfo->state == t->connection_state)) {
+        if (t != nullptr && (sinfo->state == kCsAny || sinfo->state == t->connection_state ||
+                    (sinfo->state == kCsOnline && (t->connection_state == kCsRecovery ||
+                                                   t->connection_state == kCsDevice)) )) {
             SendOkay(fd);
             break;
         } else if (!is_ambiguous) {
@@ -557,6 +559,8 @@ asocket* host_service_to_socket(const char* name, const char* serial) {
             sinfo->state = kCsBootloader;
         } else if (!strcmp(name, "-any")) {
             sinfo->state = kCsAny;
+        } else if (!strcmp(name, "-online")) {
+            sinfo->state = kCsOnline;
         } else {
             return nullptr;
         }