diff options
| author | 2011-05-03 16:38:07 -0700 | |
|---|---|---|
| committer | 2011-05-03 16:38:07 -0700 | |
| commit | bf8b45cd15e4ae6aaeb29ba697b08f7ec65c195b (patch) | |
| tree | 6c23dff105d4214135621d7d13a430f3b992efa6 /include/ui/FramebufferNativeWindow.h | |
| parent | ec9b5d17af1199e418b7352313575f0f7288b550 (diff) | |
| parent | a269b87bd7fecbd977c6c2a054ea333d40408bfb (diff) | |
Merge changes I5c61ac40,I67c40a3c,I3e2ddd01
* changes:
frameworks/base: switch CameraService to a HAL module
frameworks/base: make the ANativeWindow query() method const
frameworks/base: include system/core header camera.h in Camera.h
Diffstat (limited to 'include/ui/FramebufferNativeWindow.h')
| -rw-r--r-- | include/ui/FramebufferNativeWindow.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/ui/FramebufferNativeWindow.h b/include/ui/FramebufferNativeWindow.h index 16117adca92a..3e67f9689c7f 100644 --- a/include/ui/FramebufferNativeWindow.h +++ b/include/ui/FramebufferNativeWindow.h @@ -70,7 +70,7 @@ private: static int dequeueBuffer(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 query(ANativeWindow* window, int what, int* value); + static int query(const ANativeWindow* window, int what, int* value); static int perform(ANativeWindow* window, int operation, ...); framebuffer_device_t* fbDev; |