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

Commit b2305815 authored by Glenn Kasten's avatar Glenn Kasten Committed by Android (Google) Code Review
Browse files

Merge "Fix const sp<>& in parameter list and return value"

parents 72a52e7b 1f812f72

services/audioflinger/AudioFlinger.cpp

+2 −2
Original line number Diff line number Diff line
@@ -4067,7 +4067,7 @@ AudioFlinger::Client::~Client() 
    mAudioFlinger->removeClient_l(mPid);

}



const sp<MemoryDealer>& AudioFlinger::Client::heap() const

sp<MemoryDealer> AudioFlinger::Client::heap() const

{

    return mMemoryDealer;

}
@@ -6181,7 +6181,7 @@ AudioFlinger::EffectModule::~EffectModule() 
    }

}



status_t AudioFlinger::EffectModule::addHandle(sp<EffectHandle>& handle)

status_t AudioFlinger::EffectModule::addHandle(const sp<EffectHandle>& handle)

{

    status_t status;

services/audioflinger/AudioFlinger.h

+2 −2
Original line number Diff line number Diff line
@@ -226,7 +226,7 @@ private: 
    public:

                            Client(const sp<AudioFlinger>& audioFlinger, pid_t pid);

        virtual             ~Client();

        const sp<MemoryDealer>&     heap() const;

        sp<MemoryDealer>    heap() const;

        pid_t               pid() const { return mPid; }

        sp<AudioFlinger>    audioFlinger() { return mAudioFlinger; }
@@ -1107,7 +1107,7 @@ private: 
        void        setThread(const wp<ThreadBase>& thread) { mThread = thread; }

        wp<ThreadBase>& thread() { return mThread; }



        status_t addHandle(sp<EffectHandle>& handle);

        status_t addHandle(const sp<EffectHandle>& handle);

        void disconnect(const wp<EffectHandle>& handle, bool unpiniflast);

        size_t removeHandle (const wp<EffectHandle>& handle);