diff options
| author | The Android Open Source Project <initial-contribution@android.com> | 2014-11-06 17:49:48 -0800 |
|---|---|---|
| committer | The Android Open Source Project <initial-contribution@android.com> | 2014-11-06 17:49:48 -0800 |
| commit | e1a2df553a6d151807a5da738a3cd853bef908d9 (patch) | |
| tree | 9015c1c9ad9ec69f1962657f70fe3df386fbb05a /media/mediaserver/main_mediaserver.cpp | |
| parent | bcf093bfef277a8ec0119da9e84e5abac58ad0b1 (diff) | |
| parent | 841daebc75fbf5e7fb4dd71cab559b8f4d7150ae (diff) | |
| download | frameworks_av-e1a2df553a6d151807a5da738a3cd853bef908d9.zip frameworks_av-e1a2df553a6d151807a5da738a3cd853bef908d9.tar.gz frameworks_av-e1a2df553a6d151807a5da738a3cd853bef908d9.tar.bz2 | |
Resolve conflict
Diffstat (limited to 'media/mediaserver/main_mediaserver.cpp')
| -rw-r--r-- | media/mediaserver/main_mediaserver.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/media/mediaserver/main_mediaserver.cpp b/media/mediaserver/main_mediaserver.cpp index d5207d5..af1c9e6 100644 --- a/media/mediaserver/main_mediaserver.cpp +++ b/media/mediaserver/main_mediaserver.cpp @@ -34,10 +34,11 @@ #include "MediaLogService.h" #include "MediaPlayerService.h" #include "AudioPolicyService.h" +#include "SoundTriggerHwService.h" using namespace android; -int main(int argc, char** argv) +int main(int argc __unused, char** argv) { signal(SIGPIPE, SIG_IGN); char value[PROPERTY_VALUE_MAX]; @@ -128,6 +129,7 @@ int main(int argc, char** argv) MediaPlayerService::instantiate(); CameraService::instantiate(); AudioPolicyService::instantiate(); + SoundTriggerHwService::instantiate(); registerExtensions(); ProcessState::self()->startThreadPool(); IPCThreadState::self()->joinThreadPool(); |