Merge "Silence warnings about unused parameters." (7d587c31) · Commits · e / os / android_frameworks_native-old

services/surfaceflinger/DisplayDevice.cpp

+1 −1

Original line number	Diff line number	Diff line
		@@ -180,7 +180,7 @@ status_t DisplayDevice::compositionComplete() const {
		return mDisplaySurface->compositionComplete();
		}

		void DisplayDevice::flip(const Region& dirty) const
		void DisplayDevice::flip(const Region& dirty __unused) const
		{
		mFlinger->getRenderEngine().checkErrors();

services/surfaceflinger/DisplayHardware/VirtualDisplaySurface.cpp

+1 −1

Original line number	Diff line number	Diff line
		@@ -244,7 +244,7 @@ void VirtualDisplaySurface::onFrameCommitted() {
		resetPerFrameState();
		}

		void VirtualDisplaySurface::dump(String8& result) const {
		void VirtualDisplaySurface::dump(String8&) const {
		}

		status_t VirtualDisplaySurface::requestBuffer(int pslot,

services/surfaceflinger/Layer.cpp

+4 −4

Original line number	Diff line number	Diff line
		@@ -144,7 +144,7 @@ Layer::~Layer() {
		// callbacks
		// ---------------------------------------------------------------------------

		void Layer::onLayerDisplayed(const sp<const DisplayDevice>& hw,
		void Layer::onLayerDisplayed(const sp<const DisplayDevice>&,
		HWComposer::HWCLayerInterface* layer) {
		if (layer) {
		layer->onDisplayed();
		@@ -418,7 +418,7 @@ void Layer::setPerFrameData(const sp<const DisplayDevice>& hw,
		layer.setBuffer(mActiveBuffer);
		}

		void Layer::setAcquireFence(const sp<const DisplayDevice>& hw,
		void Layer::setAcquireFence(const sp<const DisplayDevice>&,
		HWComposer::HWCLayerInterface& layer) {
		int fenceFd = -1;

		@@ -545,7 +545,7 @@ void Layer::onDraw(const sp<const DisplayDevice>& hw, const Region& clip) const
		}


		void Layer::clearWithOpenGL(const sp<const DisplayDevice>& hw, const Region& clip,
		void Layer::clearWithOpenGL(const sp<const DisplayDevice>& hw, const Region&,
		float red, float green, float blue, float alpha) const
		{
		RenderEngine& engine(mFlinger->getRenderEngine());
		@@ -560,7 +560,7 @@ void Layer::clearWithOpenGL(
		}

		void Layer::drawWithOpenGL(
		const sp<const DisplayDevice>& hw, const Region& clip) const {
		const sp<const DisplayDevice>& hw, const Region&) const {
		const uint32_t fbHeight = hw->getHeight();
		const State& s(getDrawingState());

services/surfaceflinger/LayerDim.cpp

+1 −1

Original line number	Diff line number	Diff line
		@@ -39,7 +39,7 @@ LayerDim::LayerDim(SurfaceFlinger* flinger, const sp<Client>& client,
		LayerDim::~LayerDim() {
		}

		void LayerDim::onDraw(const sp<const DisplayDevice>& hw, const Region& clip) const
		void LayerDim::onDraw(const sp<const DisplayDevice>& hw, const Region&) const
		{
		const State& s(getDrawingState());
		if (s.alpha>0) {

services/surfaceflinger/SurfaceFlinger.cpp

+7 −7

Original line number	Diff line number	Diff line
		@@ -190,7 +190,7 @@ SurfaceFlinger::~SurfaceFlinger()
		eglTerminate(display);
		}

		void SurfaceFlinger::binderDied(const wp<IBinder>& who)
		void SurfaceFlinger::binderDied(const wp<IBinder>&)
		{
		// the window manager died on us. prepare its eulogy.

		@@ -593,12 +593,12 @@ void SurfaceFlinger::signalRefresh() {
		}

		status_t SurfaceFlinger::postMessageAsync(const sp<MessageBase>& msg,
		nsecs_t reltime, uint32_t flags) {
		nsecs_t reltime, uint32_t) {
		return mEventQueue.postMessage(msg, reltime);
		}

		status_t SurfaceFlinger::postMessageSync(const sp<MessageBase>& msg,
		nsecs_t reltime, uint32_t flags) {
		nsecs_t reltime, uint32_t) {
		status_t res = mEventQueue.postMessage(msg, reltime);
		if (res == NO_ERROR) {
		msg->wait();
		@@ -1695,7 +1695,7 @@ status_t SurfaceFlinger::removeLayer(const sp<Layer>& layer) {
		return status_t(index);
		}

		uint32_t SurfaceFlinger::peekTransactionFlags(uint32_t flags) {
		uint32_t SurfaceFlinger::peekTransactionFlags(uint32_t) {
		return android_atomic_release_load(&mTransactionFlags);
		}

		@@ -2203,7 +2203,7 @@ status_t SurfaceFlinger::dump(int fd, const Vector<String16>& args)
		return NO_ERROR;
		}

		void SurfaceFlinger::listLayersLocked(const Vector<String16>& args, size_t& index,
		void SurfaceFlinger::listLayersLocked(const Vector<String16>&, size_t&,
		String8& result) const
		{
		const LayerVector& currentLayers = mCurrentState.layersSortedByZ;
		@@ -2242,7 +2242,7 @@ void SurfaceFlinger::dumpStatsLocked(const Vector<String16>& args, size_t& index
		}

		void SurfaceFlinger::clearStatsLocked(const Vector<String16>& args, size_t& index,
		String8& result)
		String8&)
		{
		String8 name;
		if (index < args.size()) {
		@@ -2626,7 +2626,7 @@ class GraphicProducerWrapper : public BBinder, public MessageHandler {
		* data and reply Parcel and forward them to the calling thread.
		*/
		virtual status_t transact(uint32_t code,
		const Parcel& data, Parcel* reply, uint32_t flags) {
		const Parcel& data, Parcel* reply, uint32_t) {
		this->code = code;
		this->data = &data;
		this->reply = reply;