Merge "Zygote: Fix dropping capabilities in containers" am: 7175772689 am: 03c4abdb1e am: 46a35810c6
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2483735 Change-Id: I4053a717115ce4bf6ad3c002de52845e231d0b79 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
@@ -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 = {
|
||||
|
||||
Reference in New Issue
Block a user