diff options
| author | Iliyan Malchev <malchev@google.com> | 2011-05-03 16:38:07 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-05-03 16:38:07 -0700 |
| commit | bf8b45cd15e4ae6aaeb29ba697b08f7ec65c195b (patch) | |
| tree | 6c23dff105d4214135621d7d13a430f3b992efa6 /include/ui | |
| parent | ec9b5d17af1199e418b7352313575f0f7288b550 (diff) | |
| parent | a269b87bd7fecbd977c6c2a054ea333d40408bfb (diff) | |
| download | frameworks_base-bf8b45cd15e4ae6aaeb29ba697b08f7ec65c195b.zip frameworks_base-bf8b45cd15e4ae6aaeb29ba697b08f7ec65c195b.tar.gz frameworks_base-bf8b45cd15e4ae6aaeb29ba697b08f7ec65c195b.tar.bz2 | |
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')
| -rw-r--r-- | include/ui/FramebufferNativeWindow.h | 2 | ||||
| -rw-r--r-- | include/ui/egl/android_natives.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/include/ui/FramebufferNativeWindow.h b/include/ui/FramebufferNativeWindow.h index 16117ad..3e67f96 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; diff --git a/include/ui/egl/android_natives.h b/include/ui/egl/android_natives.h index 0a6e4fb..79339a4 100644 --- a/include/ui/egl/android_natives.h +++ b/include/ui/egl/android_natives.h @@ -249,7 +249,7 @@ struct ANativeWindow * * Returns 0 on success or -errno on error. */ - int (*query)(struct ANativeWindow* window, + int (*query)(const struct ANativeWindow* window, int what, int* value); /* |