diff options
| author | Benoit Goby <benoit@android.com> | 2014-03-10 19:05:13 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-03-10 19:05:13 +0000 |
| commit | 7d50596a9c27b6db6468009ad196707e08f88bd6 (patch) | |
| tree | 6ce1f2b3ea95a8950fd074afbe780a99097d5ff0 | |
| parent | 7b7d111ba21c7c5ad161207a75f72948c427b1b0 (diff) | |
| parent | 6835033af4f42132337a65eeeb1e4362a36b0465 (diff) | |
| download | frameworks_base-7d50596a9c27b6db6468009ad196707e08f88bd6.zip frameworks_base-7d50596a9c27b6db6468009ad196707e08f88bd6.tar.gz frameworks_base-7d50596a9c27b6db6468009ad196707e08f88bd6.tar.bz2 | |
am 6835033a: am c6f0b54d: Merge "Add CAP_BLOCK_SUSPEND to system server" into klp-modular-dev
* commit '6835033af4f42132337a65eeeb1e4362a36b0465':
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, |