commit 707c6eaecd940686efcd23614a7c9a12df52409f
author Mark Salyzyn <salyzyn@google.com> Mon Apr 06 18:08:28 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Mon Apr 06 18:08:28 2015 +0000
tree 7d8d8cac0f8b7ebc55c20f7d7bbdd5ea53a47392
parent 238eff454dfff016ac36092df1339f022cb4fec7
parent 0ca67965e2baf9f84a450988eb8839e926a1818b

am 08fe38e2: Merge "Allow inputflinger to have CAP_BLOCK_SUSPEND."

* commit '08fe38e23bad476be9dd46bf45ece1b5f3700178':
  Allow inputflinger to have CAP_BLOCK_SUSPEND.

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