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

Commit ca3996b3 authored by Pawan Wagh's avatar Pawan Wagh Committed by Automerger Merge Worker
Browse files

Merge "Check for null params in VolumeShaper" into main am: ff23d42f am:... 

Merge "Check for null params in VolumeShaper" into main am: ff23d42f am: 5d00c025 am: 9097e4be

Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/2647385



Change-Id: Id2af0fd9e7dbdcf4faf01508230571148e639076
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 6f8f1825 9097e4be

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
@@ -2627,6 +2627,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;