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

Commit fbccd18c 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 am: 6d7cf566 

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

Change-Id: Ie7f2e9987469c84d7f039519da3ac73120cbc1d0
parents c38c1f14 6d7cf566

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

+1 −1
Original line number Diff line number Diff line
@@ -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);