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

Commit ca51723d authored by Colin Cross's avatar Colin Cross Committed by Android (Google) Code Review
Browse files

Merge changes I155f9f77,Ibb1aa07a into oc-dev-plus-aosp 

* changes:
  Fix trivial warnings hidden by -isystem
  Fix non-trivial warnings hidden by -isystem
parents 59067134 4e399991

include/media/CasImpl.h

+1 −1
Original line number Diff line number Diff line
@@ -27,7 +27,7 @@ class ICasListener; 
using namespace media;

using namespace MediaCas;

using binder::Status;

class CasPlugin;

struct CasPlugin;

class SharedLibrary;



class CasImpl : public BnCas {

include/media/DescramblerImpl.h

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

using namespace MediaDescrambler;

using binder::Status;

class DescramblerPlugin;

struct DescramblerPlugin;

class SharedLibrary;



class DescramblerImpl : public BnDescrambler {

include/media/Interpolator.h

+1 −1
Original line number Diff line number Diff line
@@ -278,7 +278,7 @@ public: 
            if (res != NO_ERROR) {

                return res;

            }

            if (i > 0 && !(x > lastx) /* handle nan */

            if ((i > 0 && !(x > lastx)) /* handle nan */

                    || y != y /* handle nan */) {

                // This is a std::map object which imposes sorted order

                // automatically on emplace.

include/media/VolumeShaper.h

+6 −9
Original line number Diff line number Diff line
@@ -32,11 +32,8 @@ 
#define LOG_TAG "VolumeShaper"



// turn on VolumeShaper logging

#if 0

#define VS_LOG ALOGD

#else

#define VS_LOG(...)

#endif

#define VS_LOGGING 0

#define VS_LOG(...) ALOGD_IF(VS_LOGGING, __VA_ARGS__)



namespace android {
@@ -90,17 +87,17 @@ public: 
        Configuration()

            : Interpolator<S, T>()

            , mType(TYPE_SCALE)

            , mId(-1)

            , mOptionFlags(OPTION_FLAG_NONE)

            , mDurationMs(1000.)

            , mId(-1) {

            , mDurationMs(1000.) {

        }



        explicit Configuration(const Configuration &configuration)

            : Interpolator<S, T>(*static_cast<const Interpolator<S, T> *>(&configuration))

            , mType(configuration.mType)

            , mId(configuration.mId)

            , mOptionFlags(configuration.mOptionFlags)

            , mDurationMs(configuration.mDurationMs)

            , mId(configuration.mId) {

            , mDurationMs(configuration.mDurationMs) {

        }



        Type getType() const {

media/libmedia/include/media/MediaRecorderBase.h

+1 −1
Original line number Diff line number Diff line
@@ -45,7 +45,7 @@ struct MediaRecorderBase { 
                               const sp<ICameraRecordingProxy>& proxy) = 0;

    virtual status_t setPreviewSurface(const sp<IGraphicBufferProducer>& surface) = 0;

    virtual status_t setOutputFile(int fd) = 0;

    virtual status_t setNextOutputFile(int fd) {return INVALID_OPERATION;}

    virtual status_t setNextOutputFile(int /*fd*/) {return INVALID_OPERATION;}

    virtual status_t setOutputFileAuxiliary(int /*fd*/) {return INVALID_OPERATION;}

    virtual status_t setParameters(const String8& params) = 0;

    virtual status_t setListener(const sp<IMediaRecorderClient>& listener) = 0;