commit d5d0dbeadc2b5d172a9e6007c063b8d1366696e0
author Andreas Huber <andih@google.com> Mon Apr 12 11:04:46 2010 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Mon Apr 12 11:04:46 2010 -0700
tree aa70c16588e8adcd0c7d69c7cd9da201a775b409
parent a5e4677f76b2e6596c2fd6351788ecf82ae9c448
parent fe774a9c3ffe12979e182563b0e922ffc0ad20ef

Merge "Remove legacy NO_OPENCORE code bypass from MediaPlayerService." into kraken

media/libmediaplayerservice/MediaPlayerService.cpp

diff --git a/media/libmediaplayerservice/MediaPlayerService.cpp b/media/libmediaplayerservice/MediaPlayerService.cpp
index 594e010..fed4f95 100644
--- a/media/libmediaplayerservice/MediaPlayerService.cpp
+++ b/media/libmediaplayerservice/MediaPlayerService.cpp
@@ -228,14 +228,10 @@
 
 sp<IMediaRecorder> MediaPlayerService::createMediaRecorder(pid_t pid)
 {
-#ifndef NO_OPENCORE
     sp<MediaRecorderClient> recorder = new MediaRecorderClient(this, pid);
     wp<MediaRecorderClient> w = recorder;
     Mutex::Autolock lock(mLock);
     mMediaRecorderClients.add(w);
-#else
-    sp<MediaRecorderClient> recorder = NULL;
-#endif
     LOGV("Create new media recorder client from pid %d", pid);
     return recorder;
 }