diff options
| author | Mathias Agopian <mathias@google.com> | 2009-11-13 17:33:52 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2009-11-13 17:33:52 -0800 |
| commit | 35ede78ede13fc2c4e7d343f50ca20372a404e06 (patch) | |
| tree | 2d5bfea1c668196ea7caa827e0107accc8987388 /include | |
| parent | 0a27865a015d9e0401b6b3bff9eedd06d59043b3 (diff) | |
| parent | 91e40e7838d183cb2a9e750edf0a6572f21da21d (diff) | |
| download | frameworks_base-35ede78ede13fc2c4e7d343f50ca20372a404e06.zip frameworks_base-35ede78ede13fc2c4e7d343f50ca20372a404e06.tar.gz frameworks_base-35ede78ede13fc2c4e7d343f50ca20372a404e06.tar.bz2 | |
am 91e40e78: Merge change I18e02606 into eclair
Merge commit '91e40e7838d183cb2a9e750edf0a6572f21da21d' into eclair-mr2
* commit '91e40e7838d183cb2a9e750edf0a6572f21da21d':
fix some aspects of [2258746] native crash in launcher2
Diffstat (limited to 'include')
| -rw-r--r-- | include/ui/Surface.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/ui/Surface.h b/include/ui/Surface.h index 70303cd..008c297 100644 --- a/include/ui/Surface.h +++ b/include/ui/Surface.h @@ -109,7 +109,7 @@ private: ~SurfaceControl(); - status_t validate(SharedClient const* cblk) const; + status_t validate() const; void destroy(); sp<SurfaceComposerClient> mClient; @@ -190,7 +190,7 @@ private: status_t getBufferLocked(int index, int usage); - status_t validate(SharedClient const* cblk) const; + status_t validate() const; inline const GraphicBufferMapper& getBufferMapper() const { return mBufferMapper; } inline GraphicBufferMapper& getBufferMapper() { return mBufferMapper; } |