diff options
| author | Jean-Baptiste Queru <jbq@google.com> | 2010-09-09 14:13:01 -0700 |
|---|---|---|
| committer | Android Code Review <code-review@android.com> | 2010-09-09 14:13:01 -0700 |
| commit | bb130ba7998e82e79cd94cddee2b97b1ed977f21 (patch) | |
| tree | a42d0da713d4d6426f434da15624c9e0beba9853 | |
| parent | deb9188f4f64d5d475ae28e0cc9eecc6c1f61312 (diff) | |
| parent | e572d596b3715198fb48b3d8cef4939a71d58db2 (diff) | |
| download | system_core-bb130ba7998e82e79cd94cddee2b97b1ed977f21.zip system_core-bb130ba7998e82e79cd94cddee2b97b1ed977f21.tar.gz system_core-bb130ba7998e82e79cd94cddee2b97b1ed977f21.tar.bz2 | |
Merge "- Add drm and drmio service - Add /data/drm directory for storing DRM related data"
| -rw-r--r-- | include/private/android_filesystem_config.h | 4 | ||||
| -rw-r--r-- | rootdir/init.rc | 12 |
2 files changed, 16 insertions, 0 deletions
diff --git a/include/private/android_filesystem_config.h b/include/private/android_filesystem_config.h index 903f99f..b6fea03 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 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, }, diff --git a/rootdir/init.rc b/rootdir/init.rc index 1e446f7..a01fdb5 100644 --- a/rootdir/init.rc +++ b/rootdir/init.rc @@ -162,6 +162,11 @@ loglevel 3 chown root root /cache/lost+found chmod 0770 /cache/lost+found + # create data/drm directory + mkdir /data/drm 0774 drm drm + chown drm drm /data/drm + chmod 0774 /data/drm + on boot # basic network init ifup lo @@ -304,6 +309,13 @@ service zygote /system/bin/app_process -Xzygote /system/bin --zygote --start-sys onrestart write /sys/power/state on onrestart restart media +service drm /system/bin/drmserver + user drm + group system root inet + +service drmio /system/bin/drmioserver + user drmio + service media /system/bin/mediaserver user media group system audio camera graphics inet net_bt net_bt_admin net_raw |