commit b1e334a237a421cf516175dca450f8f2b17c86c8
author Jesse Wilson <jessewilson@google.com> Thu Jan 28 14:00:48 2010 -0800
committer Android (Google) Code Review <android-gerrit@google.com> Thu Jan 28 14:00:48 2010 -0800
tree 6d2b535cb4151a3fa0723db4a92e6b6121098156
parent d47a612aaae8fa232275c6b645c68f2f1eba10e8
parent fbdd5771f231e685f7e25803f4c0c41b5e9e62e7

Merge "Fix the broken compile of a currently-not-being-compiled AWT class."

camera/libcameraservice/CameraService.cpp

diff --git a/camera/libcameraservice/CameraService.cpp b/camera/libcameraservice/CameraService.cpp
index 81d60dc..405d471 100644
--- a/camera/libcameraservice/CameraService.cpp
+++ b/camera/libcameraservice/CameraService.cpp
@@ -197,7 +197,7 @@
 static sp<MediaPlayer> newMediaPlayer(const char *file)
 {
     sp<MediaPlayer> mp = new MediaPlayer();
-    if (mp->setDataSource(file) == NO_ERROR) {
+    if (mp->setDataSource(file, NULL /* headers */) == NO_ERROR) {
         mp->setAudioStreamType(AudioSystem::ENFORCED_AUDIBLE);
         mp->prepare();
     } else {