Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7843ced3 authored by Andreas Huber's avatar Andreas Huber Committed by Android (Google) Code Review
Browse files

Merge "API Extension: Support for optionally specifying a map of extra request... 

Merge "API Extension: Support for optionally specifying a map of extra request headers when specifying the uri of media data to be played."
parents a565f69c d4461e76

camera/libcameraservice/CameraService.cpp

+1 −1
Original line number Diff line number Diff line
@@ -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 {