Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am eccbc7c9: Merge "Fix NativeCrashListener"

Browse Source 
* commit 'eccbc7c96f3f3dfa82f25362cf4ed0db3d9a6cb6':
  Fix NativeCrashListener
This commit is contained in:
Neil Fuller
2015-07-16 10:42:05 +00:00
committed by Android Git Automerger
parent 737106a61b eccbc7c96f
commit 98f3d95397
1 changed files with 1 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
services/core/java/com/android/server/am/NativeCrashListener.java
View File

@@ -123,11 +123,10 @@ final class NativeCrashListener extends Thread {
Os.listen(serverFd, 1); Os.listen(serverFd, 1);
while (true) { while (true) {
InetSocketAddress peer = new InetSocketAddress();
FileDescriptor peerFd = null; FileDescriptor peerFd = null;
try { try {
if (MORE_DEBUG) Slog.v(TAG, "Waiting for debuggerd connection"); 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 (MORE_DEBUG) Slog.v(TAG, "Got debuggerd socket " + peerFd);
if (peerFd != null) { if (peerFd != null) {
// Only the superuser is allowed to talk to us over this socket // Only the superuser is allowed to talk to us over this socket