am 67672e04: Merge a775965b from gingerbread

Merge commit '67672e04111a6cfdf572023a154675749c3fb550'

* commit '67672e04111a6cfdf572023a154675749c3fb550':
  Add AID_NFC for use by the NFC service.
This commit is contained in:
Jean-Baptiste Queru 2010-10-17 11:10:36 -07:00 committed by Android Git Automerger
commit 457ce8f672
1 changed files with 2 additions and 0 deletions

View File

@ -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, },