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

Commit 4acde575 authored by Christopher Ferris's avatar Christopher Ferris Committed by Automerger Merge Worker
Browse files

Merge "Add new caps from kernel 5.8." am: c625ea61 am: 4a59a24c am: 8e435ba5 

Original change: https://android-review.googlesource.com/c/platform/system/core/+/1389265

Change-Id: I40dec2b086780a3e48dd661cafdb66fb420fb9dd
parents aaad5f37 8e435ba5

init/capabilities.cpp

+46 −38
Original line number Diff line number Diff line
@@ -66,9 +66,17 @@ static const std::map<std::string, int> cap_map = { 
        CAP_MAP_ENTRY(WAKE_ALARM),

        CAP_MAP_ENTRY(BLOCK_SUSPEND),

        CAP_MAP_ENTRY(AUDIT_READ),

#if defined(__BIONIC__)

        CAP_MAP_ENTRY(PERFMON),

        CAP_MAP_ENTRY(BPF),

#endif

};



#if defined(__BIONIC__)

static_assert(CAP_LAST_CAP == CAP_BPF, "CAP_LAST_CAP is not CAP_BPF");

#else

static_assert(CAP_LAST_CAP == CAP_AUDIT_READ, "CAP_LAST_CAP is not CAP_AUDIT_READ");

#endif



static bool ComputeCapAmbientSupported() {

#if defined(__ANDROID__)