diff options
| -rw-r--r-- | include/private/android_filesystem_config.h | 3 | ||||
| -rw-r--r-- | rootdir/Android.mk | 1 | ||||
| -rw-r--r-- | rootdir/etc/dbus.conf | 27 | ||||
| -rw-r--r-- | rootdir/init.rc | 6 |
4 files changed, 7 insertions, 30 deletions
diff --git a/include/private/android_filesystem_config.h b/include/private/android_filesystem_config.h index 540318f..5d363a7 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 \ @@ -205,7 +207,6 @@ static const struct fs_path_config android_files[] = { { 00550, AID_ROOT, AID_SHELL, 0, "system/etc/init.ril" }, { 00550, AID_ROOT, AID_SHELL, 0, "system/etc/init.testmenu" }, { 00550, AID_DHCP, AID_SHELL, 0, "system/etc/dhcpcd/dhcpcd-run-hooks" }, - { 00440, AID_BLUETOOTH, AID_BLUETOOTH, 0, "system/etc/dbus.conf" }, { 00444, AID_RADIO, AID_AUDIO, 0, "system/etc/AudioPara4.csv" }, { 00555, AID_ROOT, AID_ROOT, 0, "system/etc/ppp/*" }, { 00555, AID_ROOT, AID_ROOT, 0, "system/etc/rc.*" }, diff --git a/rootdir/Android.mk b/rootdir/Android.mk index e6887bb..3417f54 100644 --- a/rootdir/Android.mk +++ b/rootdir/Android.mk @@ -4,7 +4,6 @@ include $(CLEAR_VARS) # files that live under /system/etc/... copy_from := \ - etc/dbus.conf \ etc/hosts diff --git a/rootdir/etc/dbus.conf b/rootdir/etc/dbus.conf deleted file mode 100644 index 75586b9..0000000 --- a/rootdir/etc/dbus.conf +++ /dev/null @@ -1,27 +0,0 @@ -<!DOCTYPE busconfig PUBLIC "-//freedesktop//DTD D-Bus Bus Configuration 1.0//EN" - "http://www.freedesktop.org/standards/dbus/1.0/busconfig.dtd"> -<busconfig> - - <!-- Our well-known bus type, do not change this --> - <type>system</type> - - <!-- Only allow socket-credentials-based authentication --> - <auth>EXTERNAL</auth> - - <!-- Only listen on a local socket. (abstract=/path/to/socket - means use abstract namespace, don't really create filesystem - file; only Linux supports this. Use path=/whatever on other - systems.) --> - <listen>unix:path=/dev/socket/dbus</listen> - - <!-- Allow everything, D-Bus socket is protected by unix filesystem - permissions --> - <policy context="default"> - <allow send_interface="*"/> - <allow receive_interface="*"/> - <allow own="*"/> - <allow user="*"/> - <allow send_requested_reply="true"/> - <allow receive_requested_reply="true"/> - </policy> -</busconfig> diff --git a/rootdir/init.rc b/rootdir/init.rc index 89ec18a..f7fe6f3 100644 --- a/rootdir/init.rc +++ b/rootdir/init.rc @@ -243,6 +243,10 @@ on post-fs-data # the following directory. mkdir /data/drm 0770 drm drm + # create directory for MediaDrm plug-ins - give drm the read/write access to + # the following directory. + mkdir /data/mediadrm 0770 mediadrm mediadrm + # symlink to bugreport storage location symlink /data/data/com.android.shell/files/bugreports /data/bugreports @@ -483,7 +487,7 @@ service drm /system/bin/drmserver service media /system/bin/mediaserver class main user media - group audio camera inet net_bt net_bt_admin net_bw_acct drmrpc + group audio camera inet net_bt net_bt_admin net_bw_acct drmrpc mediadrm ioprio rt 4 service bootanim /system/bin/bootanimation |