summaryrefslogtreecommitdiffstats
path: root/media/mediaserver
diff options
context:
space:
mode:
authorRonghua Wu <ronghuawu@google.com>2015-03-13 10:47:08 -0700
committerRonghua Wu <ronghuawu@google.com>2015-04-14 14:16:12 -0700
commit67e7f543c7f1c4fe4ee1989ceb0aebe44a63b49e (patch)
tree7de894fc9626b36de6eed70812962380ca217f22 /media/mediaserver
parent9e6955a19bf77ebf27b770e910efbe1ebf1ceac0 (diff)
downloadframeworks_av-67e7f543c7f1c4fe4ee1989ceb0aebe44a63b49e.zip
frameworks_av-67e7f543c7f1c4fe4ee1989ceb0aebe44a63b49e.tar.gz
frameworks_av-67e7f543c7f1c4fe4ee1989ceb0aebe44a63b49e.tar.bz2
media: use ResourceManagerService with MediaCodec
Bug: 19620911 Change-Id: I235a97e5195b28645b7834dda0dd77307d93f4a8
Diffstat (limited to 'media/mediaserver')
-rw-r--r--media/mediaserver/main_mediaserver.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/media/mediaserver/main_mediaserver.cpp b/media/mediaserver/main_mediaserver.cpp
index 99572f8..06b3c6e 100644
--- a/media/mediaserver/main_mediaserver.cpp
+++ b/media/mediaserver/main_mediaserver.cpp
@@ -33,6 +33,7 @@
#include "CameraService.h"
#include "MediaLogService.h"
#include "MediaPlayerService.h"
+#include "ResourceManagerService.h"
#include "service/AudioPolicyService.h"
#include "SoundTriggerHwService.h"
#include "RadioService.h"
@@ -128,6 +129,7 @@ int main(int argc __unused, char** argv)
ALOGI("ServiceManager: %p", sm.get());
AudioFlinger::instantiate();
MediaPlayerService::instantiate();
+ ResourceManagerService::instantiate();
CameraService::instantiate();
AudioPolicyService::instantiate();
SoundTriggerHwService::instantiate();