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

Commit 0446336f authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Handle failure of creating MediaPlayer properly" into pi-dev

parents ce6c8479 ef498052

services/camera/libcameraservice/CameraService.cpp

+9 −6
Original line number Diff line number Diff line
@@ -1999,14 +1999,17 @@ status_t CameraService::onTransact(uint32_t code, const Parcel& data, Parcel* re 
// A reference count is kept to determine when we will actually release the

// media players.



MediaPlayer* CameraService::newMediaPlayer(const char *file) {

    MediaPlayer* mp = new MediaPlayer();

    if (mp->setDataSource(NULL /* httpService */, file, NULL) == NO_ERROR) {

sp<MediaPlayer> CameraService::newMediaPlayer(const char *file) {

    sp<MediaPlayer> mp = new MediaPlayer();

    status_t error;

    if ((error = mp->setDataSource(NULL /* httpService */, file, NULL)) == NO_ERROR) {

        mp->setAudioStreamType(AUDIO_STREAM_ENFORCED_AUDIBLE);

        mp->prepare();

    } else {

        error = mp->prepare();

    }

    if (error != NO_ERROR) {

        ALOGE("Failed to load CameraService sounds: %s", file);

        delete mp;

        mp->disconnect();

        mp.clear();

        return nullptr;

    }

    return mp;

services/camera/libcameraservice/CameraService.h

+1 −1
Original line number Diff line number Diff line
@@ -736,7 +736,7 @@ private: 
    std::vector<std::string> mNormalDeviceIds;



    // sounds

    MediaPlayer*        newMediaPlayer(const char *file);

    sp<MediaPlayer>     newMediaPlayer(const char *file);



    Mutex               mSoundLock;

    sp<MediaPlayer>     mSoundPlayer[NUM_SOUNDS];