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

Commit a62bf8bb authored by Brad Fitzpatrick's avatar Brad Fitzpatrick Committed by Android Git Automerger
Browse files

am b901c9ab: am 9204644d: Merge "Fix a race condition in NativeDaemonConnector" 

* commit 'b901c9ab':
  Fix a race condition in NativeDaemonConnector
parents 6b497a04 b901c9ab

services/java/com/android/server/NativeDaemonConnector.java

+2 −1
Original line number Original line Diff line number Diff line
@@ -97,11 +97,12 @@ final class NativeDaemonConnector implements Runnable { 
                    LocalSocketAddress.Namespace.RESERVED);

                    LocalSocketAddress.Namespace.RESERVED);





            socket.connect(address);

            socket.connect(address);

            mCallbacks.onDaemonConnected();





            InputStream inputStream = socket.getInputStream();

            InputStream inputStream = socket.getInputStream();

            mOutputStream = socket.getOutputStream();

            mOutputStream = socket.getOutputStream();





            mCallbacks.onDaemonConnected();



            byte[] buffer = new byte[BUFFER_SIZE];

            byte[] buffer = new byte[BUFFER_SIZE];

            int start = 0;

            int start = 0;