diff options
| author | 2011-05-03 16:38:07 -0700 | |
|---|---|---|
| committer | 2011-05-03 16:38:07 -0700 | |
| commit | bf8b45cd15e4ae6aaeb29ba697b08f7ec65c195b (patch) | |
| tree | 6c23dff105d4214135621d7d13a430f3b992efa6 /libs/gui/Surface.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/gui/Surface.cpp')
| -rw-r--r-- | libs/gui/Surface.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libs/gui/Surface.cpp b/libs/gui/Surface.cpp index 44d9b4b4d329..812bd6ab2d57 100644 --- a/libs/gui/Surface.cpp +++ b/libs/gui/Surface.cpp @@ -536,9 +536,9 @@ int Surface::queueBuffer(ANativeWindow* window, return self->queueBuffer(buffer); } -int Surface::query(ANativeWindow* window, +int Surface::query(const ANativeWindow* window, int what, int* value) { - Surface* self = getSelf(window); + const Surface* self = getSelf(window); return self->query(what, value); } @@ -697,7 +697,7 @@ int Surface::queueBuffer(android_native_buffer_t* buffer) return err; } -int Surface::query(int what, int* value) +int Surface::query(int what, int* value) const { switch (what) { case NATIVE_WINDOW_WIDTH: |