am 26ce6e0e: manual merge from readonly-korg-master
Merge commit '26ce6e0e1608a9e804fa9721cc6326cdbaa5b7c1'
* commit '26ce6e0e1608a9e804fa9721cc6326cdbaa5b7c1':
- Add drm and drmio service
diff --git a/include/private/android_filesystem_config.h b/include/private/android_filesystem_config.h
index 126ba70..2a60475 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 @@
{ "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 e7100b5..e894135 100644
--- a/rootdir/init.rc
+++ b/rootdir/init.rc
@@ -168,6 +168,11 @@
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
@@ -316,6 +321,13 @@
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