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

am: 0513394f85 * commit '0513394f85385d6bfa7866f1a958b038dc2826d9': Pinner service for pinning files into memory Change-Id: I85715567c54212669898b29c64309a548518a595
2016-05-12 22:07:55 +00:00
parent 390091ec01 0513394f85
commit e47be8cd79
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,