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

Commit fe855bc3 authored by Martijn Coenen's avatar Martijn Coenen Committed by Automerger Merge Worker
Browse files

Merge "Zygote: Fix dropping capabilities in containers" am: 71757726 am:... 

Merge "Zygote: Fix dropping capabilities in containers" am: 71757726 am: 03c4abdb am: 46a35810 am: 01a79642

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2483735



Change-Id: I6e9fcea73be419adb651839b4d40110c31799b6d
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 40e3ecd2 01a79642

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

+2 −1
Original line number Diff line number Diff line
@@ -721,7 +721,8 @@ public class ZygoteInit { 
        } catch (ErrnoException ex) {

            throw new RuntimeException("Failed to capget()", ex);

        }

        capabilities &= ((long) data[0].effective) | (((long) data[1].effective) << 32);

        capabilities &= Integer.toUnsignedLong(data[0].effective) |

                (Integer.toUnsignedLong(data[1].effective) << 32);



        /* Hardcoded command line to start the system server */

        String[] args = {