summaryrefslogtreecommitdiff
path: root/core/java
diff options
context:
space:
mode:
authorNick Kralevich <nnk@google.com>2014-04-24 18:18:01 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2014-04-24 18:18:02 +0000
commit8480384986c314bd97b841cbf7f63acb7055ecef (patch)
tree37939089d9f2904809510f107f660d63b47824ab /core/java
parentdbb0de21d35343504b096ae6cbf97d122ac410c9 (diff)
parent49cbafad9beb6041aaee773f75473fdb5022888e (diff)
Merge "Zygote: enable CAP_BLOCK_SUSPEND capability for system server"
Diffstat (limited to 'core/java')
-rw-r--r--core/java/com/android/internal/os/ZygoteInit.java1
1 files changed, 1 insertions, 0 deletions
diff --git a/core/java/com/android/internal/os/ZygoteInit.java b/core/java/com/android/internal/os/ZygoteInit.java
index 495cc5fd8b4b..3f5ad86c4dbf 100644
--- a/core/java/com/android/internal/os/ZygoteInit.java
+++ b/core/java/com/android/internal/os/ZygoteInit.java
@@ -499,6 +499,7 @@ public class ZygoteInit {
private static boolean startSystemServer()
throws MethodAndArgsCaller, RuntimeException {
long capabilities = posixCapabilitiesAsBits(
+ OsConstants.CAP_BLOCK_SUSPEND,
OsConstants.CAP_KILL,
OsConstants.CAP_NET_ADMIN,
OsConstants.CAP_NET_BIND_SERVICE,