summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Neil Fuller <nfuller@google.com> 2015-07-16 10:59:04 +0000
committer Android Git Automerger <android-git-automerger@android.com> 2015-07-16 10:59:04 +0000
commitd3f9858d65633dbba488250f5bc808bbbc44c372 (patch)
tree9800407a6caa2d9b7940a093b53677d8265937f4
parenta82152aaf49b893ad11e6ecdb1fafbef12add586 (diff)
parent98f3d95397a6213917171e1a03dc39719ece08ee (diff)
am 98f3d953: am eccbc7c9: Merge "Fix NativeCrashListener"
* commit '98f3d95397a6213917171e1a03dc39719ece08ee': Fix NativeCrashListener
-rw-r--r--services/core/java/com/android/server/am/NativeCrashListener.java3
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