Merge "Zygote: Add CAP_WAKE_ALARM to system_server to properly support timerfd alarms" am: 1085be0ce3 am: 5e23ab394a

am: 55b3a9ceb3 Change-Id: Iaf49bda287e258e54ebf72ef1837dfb5f528eecc
2016-08-03 00:23:36 +00:00
parent c185662625 55b3a9ceb3
commit 15cb51e04a
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
@@ -622,7 +622,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
        );
        /* Containers run without this capability, so avoid setting it in that case */
        if (!SystemProperties.getBoolean(PROPERTY_RUNNING_IN_CONTAINER, false)) {