summaryrefslogtreecommitdiffstats
path: root/include/private
diff options
context:
space:
mode:
authorJean-Baptiste Queru <jbq@google.com>2010-09-10 10:42:02 -0700
committerJean-Baptiste Queru <jbq@google.com>2010-09-10 10:43:36 -0700
commit26ce6e0e1608a9e804fa9721cc6326cdbaa5b7c1 (patch)
tree3a8d2dafed8d089a524aae2dc242204f1fcad0ee /include/private
parent8df3a4a554184afba71887995c5f0983ce81196f (diff)
parentbb130ba7998e82e79cd94cddee2b97b1ed977f21 (diff)
downloadsystem_core-26ce6e0e1608a9e804fa9721cc6326cdbaa5b7c1.zip
system_core-26ce6e0e1608a9e804fa9721cc6326cdbaa5b7c1.tar.gz
system_core-26ce6e0e1608a9e804fa9721cc6326cdbaa5b7c1.tar.bz2
manual merge from readonly-korg-master
Change-Id: Id17f69d22fbbc84578be5aadd5e8e906ff0eb548
Diffstat (limited to 'include/private')
-rw-r--r--include/private/android_filesystem_config.h4
1 files changed, 4 insertions, 0 deletions
diff --git a/include/private/android_filesystem_config.h b/include/private/android_filesystem_config.h
index 8acca5a..121d082 100644
--- a/include/private/android_filesystem_config.h
+++ b/include/private/android_filesystem_config.h
@@ -52,6 +52,8 @@
#define AID_VPN 1016 /* vpn system */
#define AID_KEYSTORE 1017 /* keystore subsystem */
#define AID_USB 1018 /* USB devices */
+#define AID_DRM 1019 /* DRM server */
+#define AID_DRMIO 1020 /* DRM IO server */
#define AID_SHELL 2000 /* adb and debug shell user */
#define AID_CACHE 2001 /* cache access */
@@ -93,6 +95,8 @@ static const struct android_id_info android_ids[] = {
{ "adb", AID_ADB, },
{ "install", AID_INSTALL, },
{ "media", AID_MEDIA, },
+ { "drm", AID_DRM, },
+ { "drmio", AID_DRMIO, },
{ "shell", AID_SHELL, },
{ "cache", AID_CACHE, },
{ "diag", AID_DIAG, },