summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorJeff Tinker <jtinker@google.com>2013-04-24 21:56:49 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2013-04-24 21:56:49 -0700
commit7629bf19a139cbc204e8ae78cb82c2faeba6d2f0 (patch)
tree1817ae01f80eaa3e6fb74132b9fdf9536900c3e9 /include
parent49edc0acf8c78171751676af0f530d9529987075 (diff)
parent9e9ed1b40010745e709157a6977ba6d053d46c49 (diff)
downloadsystem_core-7629bf19a139cbc204e8ae78cb82c2faeba6d2f0.zip
system_core-7629bf19a139cbc204e8ae78cb82c2faeba6d2f0.tar.gz
system_core-7629bf19a139cbc204e8ae78cb82c2faeba6d2f0.tar.bz2
am 9e9ed1b4: am 131ee07b: Merge "Add a new group for MediaDrm engine plugins" into jb-mr2-dev
* commit '9e9ed1b40010745e709157a6977ba6d053d46c49': Add a new group for MediaDrm engine plugins
Diffstat (limited to 'include')
-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 64c9092..4a7d377 100644
--- a/include/private/android_filesystem_config.h
+++ b/include/private/android_filesystem_config.h
@@ -71,6 +71,7 @@
#define AID_SDCARD_R 1028 /* external storage read access */
#define AID_CLAT 1029 /* clat part of nat464 */
#define AID_LOOP_RADIO 1030 /* loop radio devices */
+#define AID_MEDIA_DRM 1031 /* MediaDrm plugins */
#define AID_SHELL 2000 /* adb and debug shell user */
#define AID_CACHE 2001 /* cache access */
@@ -150,6 +151,7 @@ static const struct android_id_info android_ids[] = {
{ "misc", AID_MISC, },
{ "nobody", AID_NOBODY, },
{ "clat", AID_CLAT, },
+ { "mediadrm", AID_MEDIA_DRM, },
};
#define android_id_count \