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

Commit ff23d42f authored by Pawan Wagh's avatar Pawan Wagh Committed by Gerrit Code Review
Browse files

Merge "Check for null params in VolumeShaper" into main

parents 2410aa74 8282bb49

include/media/VolumeShaper.h

+1 −1
Original line number Diff line number Diff line
@@ -1099,7 +1099,7 @@ public: 
     * internal to the VolumeHandler.

     */

    void setIdIfNecessary(const sp<VolumeShaper::Configuration> &configuration) {

        if (configuration->getType() == VolumeShaper::Configuration::TYPE_SCALE) {

        if (configuration && configuration->getType() == VolumeShaper::Configuration::TYPE_SCALE) {

            const int id = configuration->getId();

            if (id == -1) {

                // Reassign to a unique id, skipping system ids.

media/libmediaplayerservice/MediaPlayerService.cpp

+10 −0
Original line number Diff line number Diff line
@@ -2611,6 +2611,16 @@ VolumeShaper::Status MediaPlayerService::AudioOutput::applyVolumeShaper( 
    Mutex::Autolock lock(mLock);

    ALOGV("AudioOutput::applyVolumeShaper");



    if (configuration == nullptr) {

        ALOGE("AudioOutput::applyVolumeShaper Null configuration parameter");

        return VolumeShaper::Status(BAD_VALUE);

    }



    if (operation == nullptr) {

        ALOGE("AudioOutput::applyVolumeShaper Null operation parameter");

        return VolumeShaper::Status(BAD_VALUE);

    }



    mVolumeHandler->setIdIfNecessary(configuration);



    VolumeShaper::Status status;