commit 29527c9db5fcaac8ae4c567304d8b7160110214b
author Brett Chabot <brettchabot@android.com> Fri Jun 24 14:34:26 2011 -0700
committer Brett Chabot <brettchabot@android.com> Fri Jun 24 14:36:40 2011 -0700
tree f84316a4671114f314648d270396428d80bf2aca
parent a8b4a0eec5e3ab181b3d26223c84c556bead06c8

Fix for adb shell hang after adb root.

Abort JDWP thread if netstate is shutting down.

Bug 4731499

Change-Id: I4e1ec9cf64d00682b1dd10e448c3665a4fc77ba8

vm/jdwp/JdwpAdb.cpp

diff --git a/vm/jdwp/JdwpAdb.cpp b/vm/jdwp/JdwpAdb.cpp
index 84abe3a..ccda1f4 100644
--- a/vm/jdwp/JdwpAdb.cpp
+++ b/vm/jdwp/JdwpAdb.cpp
@@ -270,6 +270,9 @@
             sleep_ms += (sleep_ms >> 1);
             if (sleep_ms > sleep_max_ms)
                 sleep_ms = sleep_max_ms;
+
+            if (netState->shuttingDown)
+                return false;
         }
     }