Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 55b3a9ce authored by John Stultz's avatar John Stultz Committed by android-build-merger
Browse files

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

Merge "Zygote: Add CAP_WAKE_ALARM to system_server to properly support timerfd alarms" am: 1085be0c
am: 5e23ab39

Change-Id: If1d303010a604bf6c1c745ea9e2d920eea20f5aa
parents 2068960d 5e23ab39

core/java/com/android/internal/os/ZygoteInit.java

+2 −1
Original line number Diff line number Diff line
@@ -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)) {