Merge "Zygote: Add CAP_WAKE_ALARM to system_server to properly support timerfd alarms"

2016-08-03 00:04:19 +00:00
parent 6eb30f2060 5733f387be
commit 1085be0ce3
1 changed files with 2 additions and 1 deletions
--- a/core/java/com/android/internal/os/ZygoteInit.java
+++ b/core/java/com/android/internal/os/ZygoteInit.java
@@ -595,7 +595,8 @@ public class ZygoteInit {
            OsConstants.CAP_SYS_NICE,
            OsConstants.CAP_SYS_RESOURCE,
            OsConstants.CAP_SYS_TIME,
-            OsConstants.CAP_SYS_TTY_CONFIG
+            OsConstants.CAP_SYS_TTY_CONFIG,
+            OsConstants.CAP_WAKE_ALARM
        );
        /* Hardcoded command line to start the system server */
        String args[] = {