diff options
| author | Android (Google) Code Review <android-gerrit@google.com> | 2009-05-22 08:47:54 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2009-05-22 08:47:54 -0700 |
| commit | 9681a5e06badbd817342e8f6be4ffbe9102c1e98 (patch) | |
| tree | a255b3d4a01034d30d85af850e77604f2f9cc9cc /cmds | |
| parent | 36e862a699aa2a23df1543665f39b5b0c96885fb (diff) | |
| parent | ca63bb72ef82d392c759a2bd507b7410ea82eacf (diff) | |
| download | frameworks_base-9681a5e06badbd817342e8f6be4ffbe9102c1e98.zip frameworks_base-9681a5e06badbd817342e8f6be4ffbe9102c1e98.tar.gz frameworks_base-9681a5e06badbd817342e8f6be4ffbe9102c1e98.tar.bz2 | |
Merge change 2230 into donut
* changes:
runtime: Add CAP_SYS_NICE to the system server capabilities list so it can (eventually) move arbitrary threads into different cgroups
Diffstat (limited to 'cmds')
| -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 1531a9e..476f38a 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" |