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:
@@ -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);
|
||||||
|
|||||||
Reference in New Issue
Block a user