diff options
| author | Mark Salyzyn <salyzyn@google.com> | 2015-04-06 18:19:35 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-04-06 18:19:35 +0000 |
| commit | 835a04c8527c90b0c00a2c52f67488946912c82e (patch) | |
| tree | 7d8d8cac0f8b7ebc55c20f7d7bbdd5ea53a47392 | |
| parent | 8bd4bee8397bd077ae94561fa491350f569ec6b3 (diff) | |
| parent | 5b16ceaf886e9c6d75f1122e3b53213652199c37 (diff) | |
| download | system_core-835a04c8527c90b0c00a2c52f67488946912c82e.zip system_core-835a04c8527c90b0c00a2c52f67488946912c82e.tar.gz system_core-835a04c8527c90b0c00a2c52f67488946912c82e.tar.bz2 | |
am 5b16ceaf: am 08fe38e2: Merge "Allow inputflinger to have CAP_BLOCK_SUSPEND."
* commit '5b16ceaf886e9c6d75f1122e3b53213652199c37':
Allow inputflinger to have CAP_BLOCK_SUSPEND.
| -rw-r--r-- | include/private/android_filesystem_capability.h | 4 |
1 files changed, 3 insertions, 1 deletions
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)) |