diff options
| author | Hans Boehm <hboehm@google.com> | 2021-07-14 00:37:20 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2021-07-14 00:37:20 +0000 |
| commit | a7fbddac5fff0e3cf088fe08eae2a68f34afe06a (patch) | |
| tree | 1a318f366c05211977b292ee878f2c9e6feba07b | |
| parent | ef140360c31ce5ae6eb4217f057e9a3a110aa2eb (diff) | |
| parent | 3688f9590c7e48f87ca513bc8ab7b58a54d913c0 (diff) | |
| download | base-a7fbddac5fff0e3cf088fe08eae2a68f34afe06a.tar.gz | |
Merge "Use tmpArgBuffer correctly when argBuffer is null"
| -rw-r--r-- | core/java/com/android/internal/os/Zygote.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/core/java/com/android/internal/os/Zygote.java b/core/java/com/android/internal/os/Zygote.java index fb9942ad262d..7ceb304fccea 100644 --- a/core/java/com/android/internal/os/Zygote.java +++ b/core/java/com/android/internal/os/Zygote.java @@ -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); |