LineageOS/android_development
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

am ae23694: Merge change 776 into donut

Browse Source 
Merge commit 'ae23694d167404857034b269b6a0cce4da790d64'

* commit 'ae23694d167404857034b269b6a0cce4da790d64':
  Make sure we request the Client allocation status even if we fail to open a debugger port for it.
This commit is contained in:
Android (Google) Code Review
2009-04-30 10:59:06 -07:00
committed by The Android Open Source Project
parent ca82522992 ae23694d16
commit dfad285364
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
tools/ddms/libs/ddmlib/src/com/android/ddmlib/DeviceMonitor.java
View File

@@ -748,12 +748,13 @@ final class DeviceMonitor {
if (AndroidDebugBridge.getClientSupport()) { if (AndroidDebugBridge.getClientSupport()) {
client.listenForDebugger(debuggerPort); client.listenForDebugger(debuggerPort);
} }
client.requestAllocationStatus();
} catch (IOException ioe) { } catch (IOException ioe) {
client.getClientData().setDebuggerConnectionStatus(ClientData.DEBUGGER_ERROR); client.getClientData().setDebuggerConnectionStatus(ClientData.DEBUGGER_ERROR);
Log.e("ddms", "Can't bind to local " + debuggerPort + " for debugger"); Log.e("ddms", "Can't bind to local " + debuggerPort + " for debugger");
// oh well // oh well
} }
client.requestAllocationStatus();
} else { } else {
Log.e("ddms", "Handshake with " + client + " failed!"); Log.e("ddms", "Handshake with " + client + " failed!");
/* /*