diff options
| author | Benoit Goby <benoit@android.com> | 2014-03-10 19:02:54 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-03-10 19:02:54 +0000 |
| commit | 6835033af4f42132337a65eeeb1e4362a36b0465 (patch) | |
| tree | cf76193a9a1c7438cbd8c5da6b1ef5f1d5363ea6 | |
| parent | 9e73672362e2ed98ccfcc15695645daa42a61524 (diff) | |
| parent | c6f0b54d695b49966a13bb196800a985ac6ce212 (diff) | |
| download | frameworks_base-6835033af4f42132337a65eeeb1e4362a36b0465.zip frameworks_base-6835033af4f42132337a65eeeb1e4362a36b0465.tar.gz frameworks_base-6835033af4f42132337a65eeeb1e4362a36b0465.tar.bz2 | |
am c6f0b54d: Merge "Add CAP_BLOCK_SUSPEND to system server" into klp-modular-dev
* commit 'c6f0b54d695b49966a13bb196800a985ac6ce212':
Add CAP_BLOCK_SUSPEND to system server
| -rw-r--r-- | core/java/com/android/internal/os/ZygoteInit.java | 1 |
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 4bf13fc..bf62745 100644 --- a/core/java/com/android/internal/os/ZygoteInit.java +++ b/core/java/com/android/internal/os/ZygoteInit.java @@ -505,6 +505,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, |