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 /libs/ui/FramebufferNativeWindow.cpp | |
| 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 'libs/ui/FramebufferNativeWindow.cpp')
| -rw-r--r-- | libs/ui/FramebufferNativeWindow.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libs/ui/FramebufferNativeWindow.cpp b/libs/ui/FramebufferNativeWindow.cpp index dc223f96453a..0c820e5d7683 100644 --- a/libs/ui/FramebufferNativeWindow.cpp +++ b/libs/ui/FramebufferNativeWindow.cpp @@ -270,10 +270,10 @@ int FramebufferNativeWindow::queueBuffer(ANativeWindow* window, return res; } -int FramebufferNativeWindow::query(ANativeWindow* window, +int FramebufferNativeWindow::query(const ANativeWindow* window, int what, int* value) { - FramebufferNativeWindow* self = getSelf(window); + const FramebufferNativeWindow* self = getSelf(window); Mutex::Autolock _l(self->mutex); framebuffer_device_t* fb = self->fbDev; switch (what) { |