summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNick Pelly2010-10-15 12:56:17 -0500
committerAndroid (Google) Code Review2010-10-15 12:56:17 -0500
commita775965b6c58b67f3d26a854a835db27c3244e0d (patch)
tree99eedbe56d1e6c6341607b70bd5b80fde4f3dd03
parent89aff1d22662c64cc2de384e7e2c699e4d1d5d47 (diff)
parent85905a6ab4d970f04d421bd2077ba4ad6fe67c3e (diff)
downloadplatform-system-core-a775965b6c58b67f3d26a854a835db27c3244e0d.tar.gz
platform-system-core-a775965b6c58b67f3d26a854a835db27c3244e0d.tar.xz
platform-system-core-a775965b6c58b67f3d26a854a835db27c3244e0d.zip
Merge "Add AID_NFC for use by the NFC service." into gingerbread
-rw-r--r--include/private/android_filesystem_config.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/include/private/android_filesystem_config.h b/include/private/android_filesystem_config.h
index 9aaa736ca..7d874ceb2 100644
--- a/include/private/android_filesystem_config.h
+++ b/include/private/android_filesystem_config.h
@@ -53,6 +53,7 @@
53#define AID_KEYSTORE 1017 /* keystore subsystem */ 53#define AID_KEYSTORE 1017 /* keystore subsystem */
54#define AID_USB 1018 /* USB devices */ 54#define AID_USB 1018 /* USB devices */
55#define AID_GPS 1021 /* GPS daemon */ 55#define AID_GPS 1021 /* GPS daemon */
56#define AID_NFC 1022 /* nfc subsystem */
56 57
57#define AID_SHELL 2000 /* adb and debug shell user */ 58#define AID_SHELL 2000 /* adb and debug shell user */
58#define AID_CACHE 2001 /* cache access */ 59#define AID_CACHE 2001 /* cache access */
@@ -94,6 +95,7 @@ static const struct android_id_info android_ids[] = {
94 { "adb", AID_ADB, }, 95 { "adb", AID_ADB, },
95 { "install", AID_INSTALL, }, 96 { "install", AID_INSTALL, },
96 { "media", AID_MEDIA, }, 97 { "media", AID_MEDIA, },
98 { "nfc", AID_NFC, },
97 { "shell", AID_SHELL, }, 99 { "shell", AID_SHELL, },
98 { "cache", AID_CACHE, }, 100 { "cache", AID_CACHE, },
99 { "diag", AID_DIAG, }, 101 { "diag", AID_DIAG, },