From: Treehugger Robot <treehugger-gerrit@google.com>
Date: Thu, 5 Jan 2017 19:13:38 +0000 (+0000)
Subject: Merge "Fix unquitable apps when debug enabled."
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=ec107997ab;p=android-x86%2Fart.git

Merge "Fix unquitable apps when debug enabled."
---

ec107997ab237908d2910609b3e1f9f135b6179b
diff --cc runtime/jdwp/jdwp_adb.cc
index 0eff2ab47,16e805035..d8869ad67
--- a/runtime/jdwp/jdwp_adb.cc
+++ b/runtime/jdwp/jdwp_adb.cc
@@@ -20,10 -20,10 +20,11 @@@
  #include <sys/un.h>
  #include <unistd.h>
  
 +#include "android-base/stringprintf.h"
 +
  #include "base/logging.h"
 -#include "base/stringprintf.h"
  #include "jdwp/jdwp_priv.h"
+ #include "thread-inl.h"
  
  #ifdef ART_TARGET_ANDROID
  #include "cutils/sockets.h"
@@@ -53,11 -53,11 +54,13 @@@ namespace art 
  
  namespace JDWP {
  
 +using android::base::StringPrintf;
 +
  struct JdwpAdbState : public JdwpNetStateBase {
   public:
-   explicit JdwpAdbState(JdwpState* state) : JdwpNetStateBase(state) {
+   explicit JdwpAdbState(JdwpState* state)
+       : JdwpNetStateBase(state),
+         state_lock_("JdwpAdbState lock", kJdwpAdbStateLock) {
      control_sock_ = -1;
      shutting_down_ = false;