summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Christian Wailes <chriswailes@google.com> 2020-01-17 11:51:06 -0800
committer android-build-merger <android-build-merger@google.com> 2020-01-17 11:51:06 -0800
commitc39334a805cb164d8e6e8195e6aefbea27f84bed (patch)
tree98658be508f31273f56256174cb9d70202ada135
parentc57c1c3356c1f202df3454b23f1d011b3d20c3a0 (diff)
parent391bc94404ca1ac9790a50769873041befa5c2c3 (diff)
Merge changes from topic "manual-zygote-snap"
am: 391bc94404 Change-Id: I068bfd198f2a3951fca07d623127c7cb1371b80f
-rw-r--r--core/java/com/android/internal/os/ZygoteServer.java3
1 files changed, 1 insertions, 2 deletions
diff --git a/core/java/com/android/internal/os/ZygoteServer.java b/core/java/com/android/internal/os/ZygoteServer.java
index 4a21d37a38fb..8d281b7ce9a0 100644
--- a/core/java/com/android/internal/os/ZygoteServer.java
+++ b/core/java/com/android/internal/os/ZygoteServer.java
@@ -184,9 +184,8 @@ class ZygoteServer {
Zygote.USAP_POOL_SECONDARY_SOCKET_NAME);
}
- fetchUsapPoolPolicyProps();
-
mUsapPoolSupported = true;
+ fetchUsapPoolPolicyProps();
}
void setForkChild() {