diff options
| author | Mathias Agopian <mathias@google.com> | 2011-01-25 14:46:22 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-01-25 14:46:22 -0800 |
| commit | 59f71e7feb9034c61cf531031063396d0fb97176 (patch) | |
| tree | bcfc8243386a3d71dc866eaa33430e681e8133ef /include | |
| parent | a18edb2a7685eca6e2de7d4e05290953271e7abd (diff) | |
| parent | 9bfe965ae7a400a63222e5186f6e52626b3362ba (diff) | |
| download | frameworks_native-59f71e7feb9034c61cf531031063396d0fb97176.zip frameworks_native-59f71e7feb9034c61cf531031063396d0fb97176.tar.gz frameworks_native-59f71e7feb9034c61cf531031063396d0fb97176.tar.bz2 | |
am d3fcd0a1: Merge "minor clean-up. SurfaceFlinger doesn\'t need libpixelflinger.so. (DO NOT MERGE)" into gingerbread
* commit 'd3fcd0a1c923498921107bb44fbc8b24582a170a':
minor clean-up. SurfaceFlinger doesn't need libpixelflinger.so. (DO NOT MERGE)
Diffstat (limited to 'include')
| -rw-r--r-- | include/surfaceflinger/Surface.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/surfaceflinger/Surface.h b/include/surfaceflinger/Surface.h index 22684db..7b2a7f5 100644 --- a/include/surfaceflinger/Surface.h +++ b/include/surfaceflinger/Surface.h @@ -248,7 +248,7 @@ private: uint32_t *pWidth, uint32_t *pHeight, uint32_t *pFormat, uint32_t *pUsage) const; - static void cleanCachedSurfaces(); + static void cleanCachedSurfacesLocked(); class BufferInfo { uint32_t mWidth; |