summaryrefslogtreecommitdiffstats
path: root/cmds/servicemanager
diff options
context:
space:
mode:
authoraimitakeshi <aimitakeshi@gmail.com>2010-07-29 10:12:27 +0900
committeraimitakeshi <aimitakeshi@gmail.com>2010-09-01 15:40:00 +0900
commitd074e30ce44b9e33da43b67a4515b8986ca72b26 (patch)
treecea9a809ad3b678713d10b938eb21f0d792a89d8 /cmds/servicemanager
parentf470ed8630e9e648727443b065b9f1c69fee34d6 (diff)
downloadframeworks_base-d074e30ce44b9e33da43b67a4515b8986ca72b26.zip
frameworks_base-d074e30ce44b9e33da43b67a4515b8986ca72b26.tar.gz
frameworks_base-d074e30ce44b9e33da43b67a4515b8986ca72b26.tar.bz2
Initial contribution from Sony Corporation.
Add DRM Framework to support DRM content playback together with StageFright. - DRM Framework code is added - include/drm - drm - api/current.xml is updated to include DRM Framework Java APIs - cmds/servicemanager/service_manager.c is modified to add drmManager and drmIOService. Change-Id: I6d7bc9c7067362b500e530988a9ce241761866fb
Diffstat (limited to 'cmds/servicemanager')
-rw-r--r--cmds/servicemanager/service_manager.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/cmds/servicemanager/service_manager.c b/cmds/servicemanager/service_manager.c
index a2006c1..c46901b6 100644
--- a/cmds/servicemanager/service_manager.c
+++ b/cmds/servicemanager/service_manager.c
@@ -34,6 +34,8 @@ static struct {
{ AID_MEDIA, "media.player" },
{ AID_MEDIA, "media.camera" },
{ AID_MEDIA, "media.audio_policy" },
+ { AID_DRMIO, "drm.drmIOService" },
+ { AID_DRM, "drm.drmManager" },
{ AID_RADIO, "radio.phone" },
{ AID_RADIO, "radio.sms" },
{ AID_RADIO, "radio.phonesubinfo" },