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

Commit 63ef5a38 authored by Chih-Hung Hsieh's avatar Chih-Hung Hsieh Committed by android-build-merger
Browse files

resolve merge conflicts of fd923e7f to stage-aosp-master 

am: df5d9246

Change-Id: I20767244fef48ad42334c5131e2d402f75bb7327
parents b8750e11 df5d9246

include/media/AudioSystem.h

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


    static audio_mode_t getPhoneState();



    static status_t registerPolicyMixes(Vector<AudioMix> mixes, bool registration);

    static status_t registerPolicyMixes(const Vector<AudioMix>& mixes, bool registration);



    static status_t startAudioSource(const struct audio_port_config *source,

                                      const audio_attributes_t *attributes,

include/media/IAudioPolicyService.h

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


    virtual audio_mode_t getPhoneState() = 0;



    virtual status_t registerPolicyMixes(Vector<AudioMix> mixes, bool registration) = 0;

    virtual status_t registerPolicyMixes(const Vector<AudioMix>& mixes, bool registration) = 0;



    virtual status_t startAudioSource(const struct audio_port_config *source,

                                      const audio_attributes_t *attributes,

include/media/RingBuffer.h

+1 −1
Original line number Diff line number Diff line
@@ -39,7 +39,7 @@ public: 
    /**

     * Construct a RingBuffer that can grow up to the given length.

     */

    RingBuffer(size_t length);

    explicit RingBuffer(size_t length);



    /**

     * Forward iterator to this class.  Implements an std:forward_iterator.

include/media/SharedLibrary.h

+1 −1
Original line number Diff line number Diff line
@@ -24,7 +24,7 @@ 
namespace android {

    class SharedLibrary : public RefBase {

    public:

        SharedLibrary(const String8 &path);

        explicit SharedLibrary(const String8 &path);

        ~SharedLibrary();



        bool operator!() const;

media/libmedia/AudioSystem.cpp

+1 −1
Original line number Diff line number Diff line
@@ -1166,7 +1166,7 @@ audio_mode_t AudioSystem::getPhoneState() 
    return aps->getPhoneState();

}



status_t AudioSystem::registerPolicyMixes(Vector<AudioMix> mixes, bool registration)

status_t AudioSystem::registerPolicyMixes(const Vector<AudioMix>& mixes, bool registration)

{

    const sp<IAudioPolicyService>& aps = AudioSystem::get_audio_policy_service();

    if (aps == 0) return PERMISSION_DENIED;