summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBenoit Goby <benoit@android.com>2014-03-10 18:59:05 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2014-03-10 18:59:05 +0000
commitc6f0b54d695b49966a13bb196800a985ac6ce212 (patch)
tree0fd1293dd5eed5ae399d698519ae2bb8cead10af
parent1062080cd323c14d5bd24fb308da9431a0d250e5 (diff)
parenta26d08e612ec38c1d0f9d2b9f80d9d558ab26538 (diff)
downloadframeworks_base-c6f0b54d695b49966a13bb196800a985ac6ce212.zip
frameworks_base-c6f0b54d695b49966a13bb196800a985ac6ce212.tar.gz
frameworks_base-c6f0b54d695b49966a13bb196800a985ac6ce212.tar.bz2
Merge "Add CAP_BLOCK_SUSPEND to system server" into klp-modular-dev
-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 55d5513..9dc9116 100644
--- a/core/java/com/android/internal/os/ZygoteInit.java
+++ b/core/java/com/android/internal/os/ZygoteInit.java
@@ -495,6 +495,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,