diff options
| author | 2015-07-16 17:17:15 +0000 | |
|---|---|---|
| committer | 2015-07-16 17:17:15 +0000 | |
| commit | a4241839d1a8860f13b417f521a6a3c9a8052b41 (patch) | |
| tree | 1d566637ec61a8f45baff46c3c7f10208924cb91 | |
| parent | 465fd36db24fa18a5612a275fe147097694134ac (diff) | |
| parent | d3f9858d65633dbba488250f5bc808bbbc44c372 (diff) | |
am d3f9858d: am 98f3d953: am eccbc7c9: Merge "Fix NativeCrashListener"
* commit 'd3f9858d65633dbba488250f5bc808bbbc44c372':
Fix NativeCrashListener
| -rw-r--r-- | services/core/java/com/android/server/am/NativeCrashListener.java | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/services/core/java/com/android/server/am/NativeCrashListener.java b/services/core/java/com/android/server/am/NativeCrashListener.java index ca0d57865089..d0973d50fc3e 100644 --- a/services/core/java/com/android/server/am/NativeCrashListener.java +++ b/services/core/java/com/android/server/am/NativeCrashListener.java @@ -123,11 +123,10 @@ final class NativeCrashListener extends Thread { Os.listen(serverFd, 1); while (true) { - InetSocketAddress peer = new InetSocketAddress(); FileDescriptor peerFd = null; try { if (MORE_DEBUG) Slog.v(TAG, "Waiting for debuggerd connection"); - peerFd = Os.accept(serverFd, peer); + peerFd = Os.accept(serverFd, null /* peerAddress */); if (MORE_DEBUG) Slog.v(TAG, "Got debuggerd socket " + peerFd); if (peerFd != null) { // Only the superuser is allowed to talk to us over this socket |