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

Commit 1843a8e5 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Avoid creating sp<> from a pointer" am: 29fb0f2a am: b6b4b2c9 am:... 

Merge "Avoid creating sp<> from a pointer" am: 29fb0f2a am: b6b4b2c9 am: dee5a92f am: 8e607f6c

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



Change-Id: Iaafc2a7f94a148dd7f09bde370dbdd6d8642fa54
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 114df75c 8e607f6c

media/libaudioclient/include/media/AudioEffect.h

+1 −1
Original line number Diff line number Diff line
@@ -648,7 +648,7 @@ private: 
    {

    public:



        EffectClient(AudioEffect *effect) : mEffect(effect){}

        explicit EffectClient(const sp<AudioEffect>& effect) : mEffect(effect){}



        // IEffectClient

        binder::Status controlStatusChanged(bool controlGranted) override {

media/libaudiofoundation/include/media/DeviceDescriptorBase.h

+1 −1
Original line number Diff line number Diff line
@@ -53,7 +53,7 @@ public: 


    // AudioPortConfig

    virtual sp<AudioPort> getAudioPort() const {

        return static_cast<AudioPort*>(const_cast<DeviceDescriptorBase*>(this));

        return sp<AudioPort>::fromExisting(const_cast<DeviceDescriptorBase*>(this));

    }

    virtual void toAudioPortConfig(struct audio_port_config *dstConfig,

            const struct audio_port_config *srcConfig = NULL) const;