Merge "Use tmpArgBuffer correctly when argBuffer is null" am: a7fbddac5f am: 6d7cf56683 am: fbccd18cb1 am: 980b437c86

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

Change-Id: Icf1d9d2f92eea481449f7dc0c4a4fbe2d7b8c944
This commit is contained in:
Hans Boehm
2021-07-14 01:42:04 +00:00
committed by Automerger Merge Worker

View File

@@ -747,7 +747,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);