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

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

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

parents 7e8b1832 bb54e20b

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

+1 −1
Original line number Diff line number Diff line
@@ -38,7 +38,7 @@ public: 
class AudioRouteVector : public Vector<sp<AudioRoute> >

{

public:

    status_t dump(int fd, int spaces) const;

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

};



} // namespace android

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

+2 −1
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ 


#include <utils/Errors.h>

#include <utils/RefBase.h>

#include <utils/String8.h>

#include <system/audio.h>



namespace android {
@@ -53,7 +54,7 @@ public: 
    int getMaxRampInMs() const { return mGain.max_ramp_ms; }



    // TODO: remove dump from here (split serialization)

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

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



    void getDefaultConfig(struct audio_gain_config *config);

    status_t checkConfig(const struct audio_gain_config *config);

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

+2 −2
Original line number Diff line number Diff line
@@ -41,7 +41,7 @@ public: 
    audio_port_handle_t getId() const;

    audio_module_handle_t getModuleHandle() const;



    status_t    dump(int fd);

    void dump(String8 *dst) const override;



    audio_io_handle_t   mIoHandle = AUDIO_IO_HANDLE_NONE; // input handle

    audio_devices_t     mDevice = AUDIO_DEVICE_NONE;  // current device this input is routed to
@@ -127,7 +127,7 @@ public: 


    sp<AudioInputDescriptor> getInputForClient(audio_port_handle_t portId);



    status_t dump(int fd) const;

    void dump(String8 *dst) const;

};

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

+5 −6
Original line number Diff line number Diff line
@@ -44,7 +44,7 @@ public: 
                          AudioPolicyClientInterface *clientInterface);

    virtual ~AudioOutputDescriptor() {}



    status_t    dump(int fd);

    void dump(String8 *dst) const override;

    void        log(const char* indent);



    audio_port_handle_t getId() const;
@@ -150,8 +150,7 @@ public: 
                            AudioPolicyClientInterface *clientInterface);

    virtual ~SwAudioOutputDescriptor() {}



    status_t    dump(int fd);



            void dump(String8 *dst) const override;

    virtual audio_devices_t device() const;

    virtual bool sharesHwModuleWith(const sp<AudioOutputDescriptor>& outputDesc);

    virtual audio_devices_t supportedDevices();
@@ -207,7 +206,7 @@ public: 
                            AudioPolicyClientInterface *clientInterface);

    virtual ~HwAudioOutputDescriptor() {}



    status_t    dump(int fd);

            void dump(String8 *dst) const override;



    virtual audio_devices_t supportedDevices();

    virtual bool setVolume(float volume,
@@ -276,7 +275,7 @@ public: 


    sp<SwAudioOutputDescriptor> getOutputForClient(audio_port_handle_t portId);



    status_t dump(int fd) const;

    void dump(String8 *dst) const;

};



class HwAudioOutputCollection :
@@ -290,7 +289,7 @@ public: 
     */

    bool isAnyOutputActive(audio_stream_type_t streamToIgnore) const;



    status_t dump(int fd) const;

    void dump(String8 *dst) const;

};

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

+2 −1
Original line number Diff line number Diff line
@@ -132,7 +132,8 @@ public: 
    void addRoute(const sp<AudioRoute> &route) { mRoutes.add(route); }

    const AudioRouteVector &getRoutes() const { return mRoutes; }



    void dump(int fd, int spaces, bool verbose = true) const;

    void dump(String8 *dst, int spaces, bool verbose = true) const;



    void log(const char* indent) const;



    AudioGainCollection mGains; // gain controllers