commit 8f6f1e5dd5ad2f0a0c5aabc576b9bd9c20f7079c
author Tim Kilbourn <tkilbourn@google.com> Tue Mar 24 16:58:26 2015 -0700
committer Mark Salyzyn <salyzyn@google.com> Mon Apr 06 10:57:29 2015 -0700
tree b73c8474960b87cb5d09ca270fc8dfce3cfbf6bb
parent a3acbfebd98f9be5a1374df07bf3c4048c3e1d84

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

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 @@
 #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))