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

Commit 40dcffe7 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 am: 55b3a9ce
am: 15cb51e0

Change-Id: Ia4fbf6264a6ee6806b1c44d00249ce74b5999f3b
parents 0bc1ab41 15cb51e0

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

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