Merge "Pinner service for pinning files into memory" into nyc-dev am: b41088b4df am: 5fcabe19a7

am: d49592805f * commit 'd49592805f91ccd1e79027845d95c382bc59a5da': Pinner service for pinning files into memory Change-Id: I936e8146d9f60dafd5e202a7bc4b1bc2a42ddb38
2016-05-12 22:10:26 +00:00
parent d06b436822 d49592805f
commit 396da016ed
5 changed files with 139 additions and 0 deletions
--- a/core/java/com/android/internal/os/ZygoteInit.java
+++ b/core/java/com/android/internal/os/ZygoteInit.java
@@ -549,6 +549,7 @@ public class ZygoteInit {
    private static boolean startSystemServer(String abiList, String socketName)
            throws MethodAndArgsCaller, RuntimeException {
        long capabilities = posixCapabilitiesAsBits(
+            OsConstants.CAP_IPC_LOCK,
            OsConstants.CAP_KILL,
            OsConstants.CAP_NET_ADMIN,
            OsConstants.CAP_NET_BIND_SERVICE,