summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBenoit Goby <benoit@android.com>2014-02-19 18:55:28 -0800
committerBenoit Goby <benoitgoby@google.com>2014-03-08 00:17:43 +0000
commita26d08e612ec38c1d0f9d2b9f80d9d558ab26538 (patch)
tree83497b2ae71b27b90fd3ce723713e7066e9874f3
parent01b5e765e59c14cdfb62f1a8684e9116a46874d2 (diff)
downloadframeworks_base-a26d08e612ec38c1d0f9d2b9f80d9d558ab26538.zip
frameworks_base-a26d08e612ec38c1d0f9d2b9f80d9d558ab26538.tar.gz
frameworks_base-a26d08e612ec38c1d0f9d2b9f80d9d558ab26538.tar.bz2
Add CAP_BLOCK_SUSPEND to system server
With linux 3.5 and above, CAP_BLOCK_SUSPEND is needed to take a suspend blocker. CAP_BLOCK_SUSPEND has aleady been added in master. Change-Id: Ibd4b1f8498c3c4a7b69ea9fc68311546a8f0ecda
-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,