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

Commit 5e23ab39 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 alarms" 

am: 1085be0c

Change-Id: I23d7c2af33db8621b0c3b3415669543e0e3b740f
parents da9d54c6 1085be0c

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)) {