diff options
| author | Jean-Baptiste Queru <jbq@google.com> | 2010-09-10 11:30:33 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-09-10 11:30:33 -0700 |
| commit | a5220b24d1b17b142e373aacbadf79a00effbbf0 (patch) | |
| tree | eb6c1996d4923a9240298d225be0ddddae894e4e /include/private | |
| parent | e6d8a5f1dfb81113b9421ea353915cde426023ed (diff) | |
| parent | 26ce6e0e1608a9e804fa9721cc6326cdbaa5b7c1 (diff) | |
| download | core-a5220b24d1b17b142e373aacbadf79a00effbbf0.tar.gz core-a5220b24d1b17b142e373aacbadf79a00effbbf0.tar.bz2 core-a5220b24d1b17b142e373aacbadf79a00effbbf0.zip | |
am 26ce6e0e: manual merge from readonly-korg-master
Merge commit '26ce6e0e1608a9e804fa9721cc6326cdbaa5b7c1'
* commit '26ce6e0e1608a9e804fa9721cc6326cdbaa5b7c1':
- Add drm and drmio service
Diffstat (limited to 'include/private')
| -rw-r--r-- | include/private/android_filesystem_config.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/include/private/android_filesystem_config.h b/include/private/android_filesystem_config.h index 126ba7052..2a60475d0 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, }, |