From e64f3e3fee8933f2703f616f656583b3923d1b8f Mon Sep 17 00:00:00 2001 From: Neil Fuller Date: Wed, 15 Jul 2015 17:38:28 +0100 Subject: Fix NativeCrashListener In the move from InetUnixAddress to UnixSocketAddress commit e9d537506bf19375fb932ac7d25ac9a9e3aef61d did not modify the Os.accept() call in NativeCrashListener. It was passing an empty InetSocketAddress. The type could have been changed, but the peer address is never used and it is safe to pass a null. Bug: 3106438 Change-Id: I2a61221c4504657b3e1de848b0b493f202726126 --- services/core/java/com/android/server/am/NativeCrashListener.java | 3 +-- 1 file changed, 1 insertion(+), 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 -- cgit v1.2.3-59-g8ed1b