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

Commit 41abd673 authored Apr 14, 2011 by Iliyan Malchev

frameworks/base: make the ANativeWindow query() method const



query() does not modify the object's data, so it needs to be a const method

Change-Id: I67c40a3c865461e6f1cc2193fd2d74286ff6ac8f
Signed-off-by: Iliyan Malchev <malchev@google.com>

parent 5b495067

include/gui/SurfaceTextureClient.h

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -49,7 +49,7 @@ private:
	static int dequeueBuffer(ANativeWindow* window, android_native_buffer_t** buffer);		static int dequeueBuffer(ANativeWindow* window, android_native_buffer_t** buffer);
	static int lockBuffer(ANativeWindow* window, android_native_buffer_t* buffer);		static int lockBuffer(ANativeWindow* window, android_native_buffer_t* buffer);
	static int perform(ANativeWindow* window, int operation, ...);		static int perform(ANativeWindow* window, int operation, ...);
	static int query(ANativeWindow* window, int what, int* value);		static int query(const ANativeWindow* window, int what, int* value);
	static int queueBuffer(ANativeWindow* window, android_native_buffer_t* buffer);		static int queueBuffer(ANativeWindow* window, android_native_buffer_t* buffer);
	static int setSwapInterval(ANativeWindow* window, int interval);		static int setSwapInterval(ANativeWindow* window, int interval);

	@@ -57,7 +57,7 @@ private:
	int dequeueBuffer(android_native_buffer_t** buffer);		int dequeueBuffer(android_native_buffer_t** buffer);
	int lockBuffer(android_native_buffer_t* buffer);		int lockBuffer(android_native_buffer_t* buffer);
	int perform(int operation, va_list args);		int perform(int operation, va_list args);
	int query(int what, int* value);		int query(int what, int* value) const;
	int queueBuffer(android_native_buffer_t* buffer);		int queueBuffer(android_native_buffer_t* buffer);
	int setSwapInterval(int interval);		int setSwapInterval(int interval);

include/surfaceflinger/Surface.h

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -206,14 +206,14 @@ private:
	static int cancelBuffer(ANativeWindow* window, android_native_buffer_t* buffer);		static int cancelBuffer(ANativeWindow* window, android_native_buffer_t* buffer);
	static int lockBuffer(ANativeWindow* window, android_native_buffer_t* buffer);		static int lockBuffer(ANativeWindow* window, android_native_buffer_t* buffer);
	static int queueBuffer(ANativeWindow* window, android_native_buffer_t* buffer);		static int queueBuffer(ANativeWindow* window, android_native_buffer_t* buffer);
	static int query(ANativeWindow* window, int what, int* value);		static int query(const ANativeWindow* window, int what, int* value);
	static int perform(ANativeWindow* window, int operation, ...);		static int perform(ANativeWindow* window, int operation, ...);

	int dequeueBuffer(android_native_buffer_t** buffer);		int dequeueBuffer(android_native_buffer_t** buffer);
	int lockBuffer(android_native_buffer_t* buffer);		int lockBuffer(android_native_buffer_t* buffer);
	int queueBuffer(android_native_buffer_t* buffer);		int queueBuffer(android_native_buffer_t* buffer);
	int cancelBuffer(android_native_buffer_t* buffer);		int cancelBuffer(android_native_buffer_t* buffer);
	int query(int what, int* value);		int query(int what, int* value) const;
	int perform(int operation, va_list args);		int perform(int operation, va_list args);

	void dispatch_setUsage(va_list args);		void dispatch_setUsage(va_list args);

include/ui/FramebufferNativeWindow.h

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -70,7 +70,7 @@ private:
	static int dequeueBuffer(ANativeWindow* window, android_native_buffer_t** buffer);		static int dequeueBuffer(ANativeWindow* window, android_native_buffer_t** buffer);
	static int lockBuffer(ANativeWindow* window, android_native_buffer_t* buffer);		static int lockBuffer(ANativeWindow* window, android_native_buffer_t* buffer);
	static int queueBuffer(ANativeWindow* window, android_native_buffer_t* buffer);		static int queueBuffer(ANativeWindow* window, android_native_buffer_t* buffer);
	static int query(ANativeWindow* window, int what, int* value);		static int query(const ANativeWindow* window, int what, int* value);
	static int perform(ANativeWindow* window, int operation, ...);		static int perform(ANativeWindow* window, int operation, ...);

	framebuffer_device_t* fbDev;		framebuffer_device_t* fbDev;

include/ui/egl/android_natives.h

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -249,7 +249,7 @@ struct ANativeWindow
	*		*
	* Returns 0 on success or -errno on error.		* Returns 0 on success or -errno on error.
	*/		*/
	int (query)(struct ANativeWindow window,		int (query)(const struct ANativeWindow window,
	int what, int* value);		int what, int* value);

	/*		/*

libs/gui/Surface.cpp

+3 −3

Original line number	Original line	Diff line number	Diff line
	@@ -536,9 +536,9 @@ int Surface::queueBuffer(ANativeWindow* window,
	return self->queueBuffer(buffer);		return self->queueBuffer(buffer);
	}		}

	int Surface::query(ANativeWindow* window,		int Surface::query(const ANativeWindow* window,
	int what, int* value) {		int what, int* value) {
	Surface* self = getSelf(window);		const Surface* self = getSelf(window);
	return self->query(what, value);		return self->query(what, value);
	}		}

	@@ -697,7 +697,7 @@ int Surface::queueBuffer(android_native_buffer_t* buffer)
	return err;		return err;
	}		}

	int Surface::query(int what, int* value)		int Surface::query(int what, int* value) const
	{		{
	switch (what) {		switch (what) {
	case NATIVE_WINDOW_WIDTH:		case NATIVE_WINDOW_WIDTH: