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

Commit 6d7cf566 authored by Hans Boehm's avatar Hans Boehm Committed by Automerger Merge Worker
Browse files

Merge "Use tmpArgBuffer correctly when argBuffer is null" am: a7fbddac 

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1762425

Change-Id: Iba33ece5d6c6df050137c807f266acd1659810ca
parents c57a926b a7fbddac

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

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

                    Credentials peerCredentials = sessionSocket.getPeerCredentials();

                    tmpArgBuffer = new ZygoteCommandBuffer(sessionSocket);

                    args = ZygoteArguments.getInstance(argBuffer);

                    args = ZygoteArguments.getInstance(tmpArgBuffer);

                    applyUidSecurityPolicy(args, peerCredentials);

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

                    validateUsapCommand(args);