Commit: e88c967073070679cc114579023cd0dbe0ddb5f7 - system-coremmmm (git)

system/corennnnn

Commit MetaInfo

• Révision: e88c967073070679cc114579023cd0dbe0ddb5f7 (tree)
• l'heure: 2016-07-27 03:49:13
• Auteur: Andrew Boie <andrew.p.boie@inte...>
• Commiter: Jaap Jan Meijer

Message de Log

adb: reserve a wakelock when clients are connected over socket

USB OTG connections already have a wakelock reserved, but if a network
socket connection is made, the device can unexpectedly suspend
in the middle of a session. The lock is released when the client
disconnects.

Change-Id: Id5ac01699fab9350955c9814042259542fc6a694
Signed-off-by: Andrew Boie <[e-mail]>

Change Summary

• modified: adb/transport_local.cpp

Modification

--- a/adb/transport_local.cpp
+++ b/adb/transport_local.cpp
@@ -44,7 +44,46 @@
 ADB_MUTEX_DEFINE( local_transports_lock );
 
 static atransport*  local_transports[ ADB_LOCAL_TRANSPORT_MAX ];
-#endif /* ADB_HOST */
+#else /* !ADB_HOST */
+
+#define WAKE_LOCK_NAME      "adb-socket-connection"
+#define WAKE_LOCK_ACQUIRE   "/sys/power/wake_lock"
+#define WAKE_LOCK_RELEASE   "/sys/power/wake_unlock"
+
+static int sysfs_write(const char *node, const char *message)
+{
+    int fd;
+    ssize_t to_write;
+    int ret = 0;
+
+    fd = adb_open(node, O_RDWR);
+    if (!fd) {
+        D("open '%s' failed: %s\n", node, strerror(errno));
+        return -1;
+    }
+
+    to_write = strlen(message);
+    if (adb_write(fd, message, to_write) != to_write) {
+        D("write '%s' failed: %s\n", node, strerror(errno));
+        ret = -1;
+    }
+    adb_close(fd);
+    return ret;
+}
+
+static void get_wakelock(void)
+{
+    if (sysfs_write(WAKE_LOCK_ACQUIRE, WAKE_LOCK_NAME))
+        D("couldn't reserve wakelock for socket connection\n");
+}
+
+static void release_wakelock(void)
+{
+    if (sysfs_write(WAKE_LOCK_RELEASE, WAKE_LOCK_NAME))
+        D("couldn't release wakelock for socket connection\n");
+}
+
+#endif /* !ADB_HOST */
 
 static int remote_read(apacket *p, atransport *t)
 {
@@ -157,6 +196,9 @@ static void *server_socket_thread(void * arg)
         fd = adb_socket_accept(serverfd, &addr, &alen);
         if(fd >= 0) {
             D("server: new connection on fd %d\n", fd);
+#if !ADB_HOST
+            get_wakelock();
+#endif
             close_on_exec(fd);
             disable_tcp_nagle(fd);
             register_socket_transport(fd, "host", port, 1);
@@ -334,6 +376,9 @@ static void remote_kick(atransport *t)
 
 static void remote_close(atransport *t)
 {
+#if !ADB_HOST
+    release_wakelock();
+#endif
     adb_close(t->fd);
 }