commit feb2179f15bde8241814c8c35f8dace13a923ee7
author Glenn Kasten <gkasten@google.com> Wed Feb 20 16:47:28 2013 -0800
committer Glenn Kasten <gkasten@google.com> Wed Feb 20 16:47:28 2013 -0800
tree 9d8e325d2d38e6366944f186008accea0fb123b5
parent fc900c922e219771d0cd3c075720d90026e1ca4a

Permit conditional registry of mediaserver extensions

Change-Id: I94dc0d038e702dfe1779a50a1de0fae9bad15057

media/mediaserver/main_mediaserver.cpp

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 @@
         MediaPlayerService::instantiate();
         CameraService::instantiate();
         AudioPolicyService::instantiate();
+        registerExtensions();
         ProcessState::self()->startThreadPool();
         IPCThreadState::self()->joinThreadPool();
     }