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

Commit a7fbddac authored by Hans Boehm's avatar Hans Boehm Committed by Gerrit Code Review
Browse files

Merge "Use tmpArgBuffer correctly when argBuffer is null"

parents ef140360 3688f959

core/java/com/android/internal/os/Zygote.java

+1 −1
Original line number Original line Diff line number Diff line
@@ -742,7 +742,7 @@ public final class Zygote { 
                            new DataOutputStream(sessionSocket.getOutputStream());

                            new DataOutputStream(sessionSocket.getOutputStream());

                    Credentials peerCredentials = sessionSocket.getPeerCredentials();

                    Credentials peerCredentials = sessionSocket.getPeerCredentials();

                    tmpArgBuffer = new ZygoteCommandBuffer(sessionSocket);

                    tmpArgBuffer = new ZygoteCommandBuffer(sessionSocket);

                    args = ZygoteArguments.getInstance(argBuffer);

                    args = ZygoteArguments.getInstance(tmpArgBuffer);

                    applyUidSecurityPolicy(args, peerCredentials);

                    applyUidSecurityPolicy(args, peerCredentials);

                    // TODO (chriswailes): Should this only be run for debug builds?

                    // TODO (chriswailes): Should this only be run for debug builds?

                    validateUsapCommand(args);

                    validateUsapCommand(args);