diff options
| author | Mathias Agopian <mathias@google.com> | 2011-01-14 19:29:40 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-01-14 19:29:40 -0800 |
| commit | ceaf8ac31c0ee131f5c7865feb227f60def729df (patch) | |
| tree | 31619e119584facd46346dbe2bf7ca57e58058e8 /include | |
| parent | b3f44773897588cf1ab6335444e4ca5fb0160a7f (diff) | |
| parent | a7393dd66f0127c8acdd5f8928b0c2d0de602275 (diff) | |
| download | frameworks_base-ceaf8ac31c0ee131f5c7865feb227f60def729df.zip frameworks_base-ceaf8ac31c0ee131f5c7865feb227f60def729df.tar.gz frameworks_base-ceaf8ac31c0ee131f5c7865feb227f60def729df.tar.bz2 | |
am a7393dd6: Merge "Fix error reporting in Surface::cancelBuffer()" into honeycomb
* commit 'a7393dd66f0127c8acdd5f8928b0c2d0de602275':
Fix error reporting in Surface::cancelBuffer()
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 2df8ca3..5532052 100644 --- a/include/surfaceflinger/Surface.h +++ b/include/surfaceflinger/Surface.h @@ -233,7 +233,7 @@ private: * private stuff... */ void init(); - status_t validate() const; + status_t validate(bool inCancelBuffer = false) const; sp<ISurface> getISurface() const; inline const GraphicBufferMapper& getBufferMapper() const { return mBufferMapper; } |