diff options
| author | Jean-Baptiste Queru <jbq@google.com> | 2010-10-17 11:10:36 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-10-17 11:10:36 -0700 |
| commit | 457ce8f67224529a6f3524e8bbca2ecba3a80cc3 (patch) | |
| tree | e5156d3567faae26d6fc69aa432953f08008db9d /include/private | |
| parent | 5ca7509f5b188231666973a66566e6de2e3d48db (diff) | |
| parent | 67672e04111a6cfdf572023a154675749c3fb550 (diff) | |
| download | system_core-457ce8f67224529a6f3524e8bbca2ecba3a80cc3.zip system_core-457ce8f67224529a6f3524e8bbca2ecba3a80cc3.tar.gz system_core-457ce8f67224529a6f3524e8bbca2ecba3a80cc3.tar.bz2 | |
am 67672e04: Merge a775965b from gingerbread
Merge commit '67672e04111a6cfdf572023a154675749c3fb550'
* commit '67672e04111a6cfdf572023a154675749c3fb550':
Add AID_NFC for use by the NFC service.
Diffstat (limited to 'include/private')
| -rw-r--r-- | include/private/android_filesystem_config.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/private/android_filesystem_config.h b/include/private/android_filesystem_config.h index 1751e15..f6e646a 100644 --- a/include/private/android_filesystem_config.h +++ b/include/private/android_filesystem_config.h @@ -55,6 +55,7 @@ #define AID_DRM 1019 /* DRM server */ #define AID_DRMIO 1020 /* DRM IO server */ #define AID_GPS 1021 /* GPS daemon */ +#define AID_NFC 1022 /* nfc subsystem */ #define AID_SHELL 2000 /* adb and debug shell user */ #define AID_CACHE 2001 /* cache access */ @@ -98,6 +99,7 @@ static const struct android_id_info android_ids[] = { { "media", AID_MEDIA, }, { "drm", AID_DRM, }, { "drmio", AID_DRMIO, }, + { "nfc", AID_NFC, }, { "shell", AID_SHELL, }, { "cache", AID_CACHE, }, { "diag", AID_DIAG, }, |