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

Commit 8f9439a3 authored by Dan Willemsen's avatar Dan Willemsen Committed by android-build-merger
Browse files

Merge "Fix unused-parameter warnings" am: f7f08afc 

am: d2767161

Change-Id: I794d0566ff2675238689f0809b14f4b262ce8cfa
parents 7be4072d d2767161

include/media/AudioEffect.h

+1 −1
Original line number Diff line number Diff line
@@ -462,7 +462,7 @@ private: 
        }



        // IBinder::DeathRecipient

        virtual void binderDied(const wp<IBinder>& who) {

        virtual void binderDied(const wp<IBinder>& /*who*/) {

            sp<AudioEffect> effect = mEffect.promote();

            if (effect != 0) {

                effect->binderDied();

include/media/ExtendedAudioBufferProvider.h

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


    // Invoked by buffer consumer when a new timestamp is available.

    // Default implementation ignores the timestamp.

    virtual void    onTimestamp(const ExtendedTimestamp& timestamp) { }

    virtual void    onTimestamp(const ExtendedTimestamp& /*timestamp*/) { }

};



}   // namespace android

include/media/IOMX.h

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


protected:

    // check if the codec is secure.

    virtual bool isSecure(IOMX::node_id node) {

    virtual bool isSecure(IOMX::node_id /*node*/) {

        return false;

    }

};

include/media/MediaMetadataRetrieverInterface.h

+2 −2
Original line number Diff line number Diff line
@@ -54,9 +54,9 @@ public: 
    MediaMetadataRetrieverInterface() {}



    virtual             ~MediaMetadataRetrieverInterface() {}

    virtual VideoFrame* getFrameAtTime(int64_t timeUs, int option) { return NULL; }

    virtual VideoFrame* getFrameAtTime(int64_t /*timeUs*/, int /*option*/) { return NULL; }

    virtual MediaAlbumArt* extractAlbumArt() { return NULL; }

    virtual const char* extractMetadata(int keyCode) { return NULL; }

    virtual const char* extractMetadata(int /*keyCode*/) { return NULL; }

};



}; // namespace android

include/media/MediaRecorderBase.h

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

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

    virtual status_t setOutputFile(int fd, int64_t offset, int64_t length) = 0;

    virtual status_t setOutputFileAuxiliary(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;

    virtual status_t setClientName(const String16& clientName) = 0;