diff options
| author | Android (Google) Code Review <android-gerrit@google.com> | 2009-05-22 11:26:04 -0700 |
|---|---|---|
| committer | The Android Open Source Project <initial-contribution@android.com> | 2009-05-22 11:26:04 -0700 |
| commit | 9db377e3de76493e7b2108bca2190cee5004c403 (patch) | |
| tree | 5084e81c996e18e70a3f0619721765935969d142 | |
| parent | 83ce0c4fdfc0d6e6bfa8793ca9288817f6292d08 (diff) | |
| parent | 9681a5e06badbd817342e8f6be4ffbe9102c1e98 (diff) | |
| download | frameworks_base-9db377e3de76493e7b2108bca2190cee5004c403.zip frameworks_base-9db377e3de76493e7b2108bca2190cee5004c403.tar.gz frameworks_base-9db377e3de76493e7b2108bca2190cee5004c403.tar.bz2 | |
am 9681a5e0: Merge change 2230 into donut
Merge commit '9681a5e06badbd817342e8f6be4ffbe9102c1e98'
* commit '9681a5e06badbd817342e8f6be4ffbe9102c1e98':
runtime: Add CAP_SYS_NICE to the system server capabilities list so it
| -rw-r--r-- | cmds/runtime/main_runtime.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/cmds/runtime/main_runtime.cpp b/cmds/runtime/main_runtime.cpp index 718ea67..6ae3a5c 100644 --- a/cmds/runtime/main_runtime.cpp +++ b/cmds/runtime/main_runtime.cpp @@ -45,9 +45,9 @@ static const char* ZYGOTE_ARGV[] = { "--setgroups=1001,1002,1003,1004,1005,1006,1007,1008,1009,1010,3001,3002,3003", /* CAP_SYS_TTY_CONFIG & CAP_SYS_RESOURCE & CAP_NET_BROADCAST & * CAP_NET_ADMIN & CAP_NET_RAW & CAP_NET_BIND_SERVICE & CAP_KILL & - * CAP_SYS_BOOT + * CAP_SYS_BOOT CAP_SYS_NICE */ - "--capabilities=88161312,88161312", + "--capabilities=96549920,96549920", "--runtime-init", "--nice-name=system_server", "com.android.server.SystemServer" |