Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
am: 1085be0ce3

Change-Id: I23d7c2af33db8621b0c3b3415669543e0e3b740f
This commit is contained in:
John Stultz
2016-08-03 00:12:32 +00:00
committed by android-build-merger
parent da9d54c685 1085be0ce3
commit 5e23ab394a
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
core/java/com/android/internal/os/ZygoteInit.java
View File

@@ -622,7 +622,8 @@ public class ZygoteInit {
OsConstants.CAP_SYS_NICE, OsConstants.CAP_SYS_NICE,
OsConstants.CAP_SYS_RESOURCE, OsConstants.CAP_SYS_RESOURCE,
OsConstants.CAP_SYS_TIME, 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 */ /* Containers run without this capability, so avoid setting it in that case */
if (!SystemProperties.getBoolean(PROPERTY_RUNNING_IN_CONTAINER, false)) { if (!SystemProperties.getBoolean(PROPERTY_RUNNING_IN_CONTAINER, false)) {