Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 131ee07b authored by Jeff Tinker's avatar Jeff Tinker Committed by Android (Google) Code Review
Browse files

Merge "Add a new group for MediaDrm engine plugins" into jb-mr2-dev

parents 7ee2e26e 08d64308
Loading
Loading
Loading
Loading
+2 −0
Original line number Original line Diff line number Diff line
@@ -71,6 +71,7 @@
#define AID_SDCARD_R      1028  /* external storage read access */
#define AID_SDCARD_R      1028  /* external storage read access */
#define AID_CLAT          1029  /* clat part of nat464 */
#define AID_CLAT          1029  /* clat part of nat464 */
#define AID_LOOP_RADIO    1030  /* loop radio devices */
#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_SHELL         2000  /* adb and debug shell user */
#define AID_CACHE         2001  /* cache access */
#define AID_CACHE         2001  /* cache access */
@@ -150,6 +151,7 @@ static const struct android_id_info android_ids[] = {
    { "misc",      AID_MISC, },
    { "misc",      AID_MISC, },
    { "nobody",    AID_NOBODY, },
    { "nobody",    AID_NOBODY, },
    { "clat",      AID_CLAT, },
    { "clat",      AID_CLAT, },
    { "mediadrm",  AID_MEDIA_DRM, },
};
};


#define android_id_count \
#define android_id_count \
+5 −1
Original line number Original line Diff line number Diff line
@@ -243,6 +243,10 @@ on post-fs-data
    # the following directory.
    # the following directory.
    mkdir /data/drm 0770 drm drm
    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 to bugreport storage location
    symlink /data/data/com.android.shell/files/bugreports /data/bugreports
    symlink /data/data/com.android.shell/files/bugreports /data/bugreports


@@ -483,7 +487,7 @@ service drm /system/bin/drmserver
service media /system/bin/mediaserver
service media /system/bin/mediaserver
    class main
    class main
    user media
    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
    ioprio rt 4


service bootanim /system/bin/bootanimation
service bootanim /system/bin/bootanimation