commit 3a253bd4e4f9989c43e840b391a2597fba6cce3d
author Android (Google) Code Review <android-gerrit@google.com> Fri May 22 11:26:04 2009 -0700
committer The Android Open Source Project <initial-contribution@android.com> Fri May 22 11:26:04 2009 -0700
tree 714796797a846d57e3885183654a4ea668448161
parent 5752912e4bbf5696f514438e17fcc4c2610e5c59
parent 454a6255884c0899b1402a0d5f67547e47528739

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

cmds/runtime/main_runtime.cpp

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 @@
     "--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"