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

Commit 72b9ee11 authored by Andy Hung's avatar Andy Hung Committed by Android (Google) Code Review
Browse files

Merge "AudioPolicyManager: Convert dump to use String8 (part 2)"

parents b003ba18 c29d82b0

services/audiopolicy/common/managerdefinitions/include/AudioPatch.h

+3 −2
Original line number Diff line number Diff line
@@ -22,6 +22,7 @@ 
#include <utils/RefBase.h>

#include <utils/Errors.h>

#include <utils/KeyedVector.h>

#include <utils/String8.h>



namespace android {
@@ -30,7 +31,7 @@ class AudioPatch : public RefBase, private HandleGenerator<audio_patch_handle_t> 
public:

    AudioPatch(const struct audio_patch *patch, uid_t uid);



    status_t dump(int fd, int spaces, int index) const;

    void dump(String8 *dst, int spaces, int index) const;



    audio_patch_handle_t mHandle;

    struct audio_patch mPatch;
@@ -47,7 +48,7 @@ public: 


    status_t listAudioPatches(unsigned int *num_patches, struct audio_patch *patches) const;



    status_t dump(int fd) const;

    void dump(String8 *dst) const;

};



} // namespace android

services/audiopolicy/common/managerdefinitions/include/AudioPolicyMix.h

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


    void setMix(AudioMix &mix);



    status_t dump(int fd, int spaces, int index) const;

    void dump(String8 *dst, int spaces, int index) const;



private:

    AudioMix    mMix;                   // Audio policy mix descriptor
@@ -80,7 +80,7 @@ public: 


    status_t getInputMixForAttr(audio_attributes_t attr, AudioMix **policyMix);



    status_t dump(int fd) const;

    void dump(String8 *dst) const;

};



} // namespace android

services/audiopolicy/common/managerdefinitions/include/EffectDescriptor.h

+3 −2
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ 
#include <utils/KeyedVector.h>

#include <utils/RefBase.h>

#include <utils/Errors.h>

#include <utils/String8.h>



namespace android {
@@ -28,7 +29,7 @@ namespace android { 
class EffectDescriptor : public RefBase

{

public:

    status_t dump(int fd);

    void dump(String8 *dst) const;



    int mIo;                // io the effect is attached to

    routing_strategy mStrategy; // routing strategy the effect is associated to
@@ -50,7 +51,7 @@ public: 
    uint32_t getMaxEffectsMemory() const;

    bool isNonOffloadableEffectEnabled();



    status_t dump(int fd);

    void dump(String8 *dst) const;



private:

    status_t setEffectEnabled(const sp<EffectDescriptor> &effectDesc, bool enabled);

services/audiopolicy/common/managerdefinitions/include/IVolumeCurvesCollection.h

+2 −1
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ 
#include <system/audio.h>

#include <Volume.h>

#include <utils/Errors.h>

#include <utils/String8.h>



namespace android {
@@ -47,7 +48,7 @@ public: 
    virtual bool hasVolumeIndexForDevice(audio_stream_type_t stream,

                                         audio_devices_t device) const = 0;



    virtual status_t dump(int fd) const = 0;

    virtual void dump(String8 *dst) const = 0;

};



} // namespace android

services/audiopolicy/common/managerdefinitions/include/VolumeCurve.h

+3 −3
Original line number Diff line number Diff line
@@ -59,7 +59,7 @@ public: 


    float volIndexToDb(int indexInUi, int volIndexMin, int volIndexMax) const;



    void dump(int fd) const;

    void dump(String8 *result) const;



private:

    SortedVector<CurvePoint> mCurvePoints;
@@ -144,7 +144,7 @@ public: 
        }

    }



    void dump(int fd, int spaces, bool curvePoints = false) const;

    void dump(String8 *dst, int spaces, bool curvePoints = false) const;



private:

    KeyedVector<device_category, sp<VolumeCurve> > mOriginVolumeCurves;
@@ -217,7 +217,7 @@ public: 
        return getCurvesFor(stream).hasVolumeIndexForDevice(device);

    }



    virtual status_t dump(int fd) const;

    void dump(String8 *dst) const override;



    ssize_t add(const sp<VolumeCurve> &volumeCurve)

    {