commit 2dc61963a95bba11d7d9f1500869f92d90d642f8
author Josh Gao <jmgao@google.com> Wed Feb 03 22:11:45 2021 -0800
committer Josh Gao <jmgao@google.com> Mon Mar 15 16:24:08 2021 -0700
tree da1c111eabde0eb777b2fa857fb9058ca196388a
parent 822f67479cc7b5449c9b46db345e294233cfb17a

adb: add watchdog.

Bug: http://b/171526334
Test: adbd_test
Change-Id: I6fdb01855a4c0796bbf1e06efb24dd16120b5a26

adb.cpp

diff --git a/adb.cpp b/adb.cpp
index 08986b7..f9ed3d4 100644
--- a/adb.cpp
+++ b/adb.cpp
@@ -70,6 +70,25 @@
 #include "client/usb.h"
 #endif
 
+#if !ADB_HOST && defined(__ANDROID__)
+#include "daemon/watchdog.h"
+
+static std::atomic<int> active_connections = 0;
+
+static void IncrementActiveConnections() {
+    if (active_connections++ == 0) {
+        watchdog::Stop();
+    }
+}
+
+static void DecrementActiveConnections() {
+    if (--active_connections == 0) {
+        watchdog::Start();
+    }
+}
+
+#endif
+
 std::string adb_version() {
     // Don't change the format of this --- it's parsed by ddmlib.
     return android::base::StringPrintf(
@@ -111,6 +130,8 @@
     t->online = 1;
 #if ADB_HOST
     t->SetConnectionEstablished(true);
+#elif defined(__ANDROID__)
+    IncrementActiveConnections();
 #endif
 }
 
@@ -123,6 +144,10 @@
 
     LOG(INFO) << t->serial_name() << ": offline";
 
+#if !ADB_HOST && defined(__ANDROID__)
+    DecrementActiveConnections();
+#endif
+
     t->SetConnectionState(kCsOffline);
 
     // Close the associated usb