summaryrefslogtreecommitdiffstats
path: root/camera/libcameraservice
diff options
context:
space:
mode:
authorAndreas Huber <andih@google.com>2010-01-28 11:19:57 -0800
committerAndreas Huber <andih@google.com>2010-01-28 11:52:43 -0800
commit256430093679e1d62b54fb0c852126e54d162f6f (patch)
tree028c49d18e0e77bc69f8967dda61619ee324f7a2 /camera/libcameraservice
parent75d76bcf52587e4bfe00b7377d100510a3489674 (diff)
downloadframeworks_base-256430093679e1d62b54fb0c852126e54d162f6f.zip
frameworks_base-256430093679e1d62b54fb0c852126e54d162f6f.tar.gz
frameworks_base-256430093679e1d62b54fb0c852126e54d162f6f.tar.bz2
API Extension: Support for optionally specifying a map of extra request headers when specifying the uri of media data to be played.
related-to-bug: 2393577 Original change by Andrei Popescu <andreip@google.com>
Diffstat (limited to 'camera/libcameraservice')
-rw-r--r--camera/libcameraservice/CameraService.cpp2
1 files changed, 1 insertions, 1 deletions
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 @@ void CameraService::decUsers() {
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 {