Bug 1131298 - Avoid crash in CameraService

mozilla-b2g · Feb 12, 2015 · a920312 · a920312
1 parent 65f5144
commit a920312
Showing 1 changed file with 3 additions and 0 deletions.
diff --git a/services/camera/libcameraservice/CameraService.cpp b/services/camera/libcameraservice/CameraService.cpp
@@ -866,6 +866,9 @@ void CameraService::setCameraFree(int cameraId) {
 // media players.
 
 MediaPlayer* CameraService::newMediaPlayer(const char *file) {
+    // We don't use service-layer sound effects.
+    return NULL;
+
     MediaPlayer* mp = new MediaPlayer();
     if (mp->setDataSource(file, NULL) == NO_ERROR) {
         mp->setAudioStreamType(AUDIO_STREAM_ENFORCED_AUDIBLE);