From 628620c7bae0d72fbe7b472c1f14aa239e26931e Mon Sep 17 00:00:00 2001 From: Tim Kilbourn Date: Tue, 24 Mar 2015 16:58:26 -0700 Subject: Allow inputflinger to have CAP_BLOCK_SUSPEND. (Cherry picked from commit 83e6f2606b9c3488454a7bb01c7341fb43b59ac7) Resolved conflict in include/private/android_filesystem_config.h, content already in libcutils/fs_config.c. Change-Id: I817707721786e9b920fef14ebe836fdcd65a8606 --- include/private/android_filesystem_capability.h | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/include/private/android_filesystem_capability.h b/include/private/android_filesystem_capability.h index 0505cda..b92d3db 100644 --- a/include/private/android_filesystem_capability.h +++ b/include/private/android_filesystem_capability.h @@ -105,7 +105,9 @@ struct vfs_cap_data { #define CAP_MAC_ADMIN 33 #define CAP_SYSLOG 34 #define CAP_WAKE_ALARM 35 -#define CAP_LAST_CAP CAP_WAKE_ALARM +#define CAP_BLOCK_SUSPEND 36 +#define CAP_AUDIT_READ 37 +#define CAP_LAST_CAP CAP_AUDIT_READ #define cap_valid(x) ((x) >= 0 && (x) <= CAP_LAST_CAP) #define CAP_TO_INDEX(x) ((x) >> 5) #define CAP_TO_MASK(x) (1 << ((x) & 31)) -- cgit v1.1