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

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

Change-Id: Iba33ece5d6c6df050137c807f266acd1659810ca
This commit is contained in:
Hans Boehm
2021-07-14 00:53:41 +00:00
committed by Automerger Merge Worker

View File

@@ -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);