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

Commit 5848eb65 authored by Chih-hung Hsieh's avatar Chih-hung Hsieh Committed by android-build-merger
Browse files

Merge "Fix google-explicit-constructor warnings in audioflinger, audiopolicy." am: 9c9bad3c

am: f7dc6d0d

Change-Id: I83cd639d1d4d2cdb8a126efe7b87953c831cee65
parents d9a64f74 f7dc6d0d
Loading
Loading
Loading
Loading
+1 −1
Original line number Original line Diff line number Diff line
@@ -21,7 +21,7 @@ template<typename T> class AutoPark {
public:
public:


    // Park the specific FastThread, which can be nullptr, in hot idle if not currently idling
    // Park the specific FastThread, which can be nullptr, in hot idle if not currently idling
    AutoPark(const sp<T>& fastThread) : mFastThread(fastThread)
    explicit AutoPark(const sp<T>& fastThread) : mFastThread(fastThread)
    {
    {
        mPreviousCommand = FastThreadState::HOT_IDLE;
        mPreviousCommand = FastThreadState::HOT_IDLE;
        if (fastThread != nullptr) {
        if (fastThread != nullptr) {
+1 −1
Original line number Original line Diff line number Diff line
@@ -134,7 +134,7 @@ public:
        FIND_METHOD_START_VALUE,             // No samples in history, using start value
        FIND_METHOD_START_VALUE,             // No samples in history, using start value
    };
    };


    LinearMap(size_t size)
    explicit LinearMap(size_t size)
            : mSize(size),
            : mSize(size),
              mPos(0), // a circular buffer, so could start anywhere. the first sample is at 1.
              mPos(0), // a circular buffer, so could start anywhere. the first sample is at 1.
              mSamples(0),
              mSamples(0),
+1 −1
Original line number Original line Diff line number Diff line
@@ -36,7 +36,7 @@ typedef enum {
class AudioRoute  : public virtual RefBase
class AudioRoute  : public virtual RefBase
{
{
public:
public:
    AudioRoute(audio_route_type_t type) : mType(type) {}
    explicit AudioRoute(audio_route_type_t type) : mType(type) {}


    void setSources(const AudioPortVector &sources) { mSources = sources; }
    void setSources(const AudioPortVector &sources) { mSources = sources; }
    const AudioPortVector &getSources() const { return mSources; }
    const AudioPortVector &getSources() const { return mSources; }
+2 −2
Original line number Original line Diff line number Diff line
@@ -110,13 +110,13 @@ private:
class InputProfile : public IOProfile
class InputProfile : public IOProfile
{
{
public:
public:
    InputProfile(const String8 &name) : IOProfile(name, AUDIO_PORT_ROLE_SINK) {}
    explicit InputProfile(const String8 &name) : IOProfile(name, AUDIO_PORT_ROLE_SINK) {}
};
};


class OutputProfile : public IOProfile
class OutputProfile : public IOProfile
{
{
public:
public:
    OutputProfile(const String8 &name) : IOProfile(name, AUDIO_PORT_ROLE_SOURCE) {}
    explicit OutputProfile(const String8 &name) : IOProfile(name, AUDIO_PORT_ROLE_SOURCE) {}
};
};


}; // namespace android
}; // namespace android