Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d3f9858d authored by Neil Fuller's avatar Neil Fuller Committed by Android Git Automerger
Browse files

am 98f3d953: am eccbc7c9: Merge "Fix NativeCrashListener" 

* commit '98f3d953':
  Fix NativeCrashListener
parents a82152aa 98f3d953

services/core/java/com/android/server/am/NativeCrashListener.java

+1 −2
Original line number Diff line number Diff line
@@ -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