summaryrefslogtreecommitdiffstats
path: root/media/mediaserver/main_mediaserver.cpp
diff options
context:
space:
mode:
authorGlenn Kasten <gkasten@google.com>2013-02-20 16:47:28 -0800
committerGlenn Kasten <gkasten@google.com>2013-02-20 16:47:28 -0800
commitfeb2179f15bde8241814c8c35f8dace13a923ee7 (patch)
tree9d8e325d2d38e6366944f186008accea0fb123b5 /media/mediaserver/main_mediaserver.cpp
parentfc900c922e219771d0cd3c075720d90026e1ca4a (diff)
downloadframeworks_av-feb2179f15bde8241814c8c35f8dace13a923ee7.zip
frameworks_av-feb2179f15bde8241814c8c35f8dace13a923ee7.tar.gz
frameworks_av-feb2179f15bde8241814c8c35f8dace13a923ee7.tar.bz2
Permit conditional registry of mediaserver extensions
Change-Id: I94dc0d038e702dfe1779a50a1de0fae9bad15057
Diffstat (limited to 'media/mediaserver/main_mediaserver.cpp')
-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 0862952..d5207d5 100644
--- a/media/mediaserver/main_mediaserver.cpp
+++ b/media/mediaserver/main_mediaserver.cpp
@@ -26,6 +26,7 @@
#include <binder/IServiceManager.h>
#include <cutils/properties.h>
#include <utils/Log.h>
+#include "RegisterExtensions.h"
// from LOCAL_C_INCLUDES
#include "AudioFlinger.h"
@@ -127,6 +128,7 @@ int main(int argc, char** argv)
MediaPlayerService::instantiate();
CameraService::instantiate();
AudioPolicyService::instantiate();
+ registerExtensions();
ProcessState::self()->startThreadPool();
IPCThreadState::self()->joinThreadPool();
}