diff options
| author | Mathias Agopian <mathias@google.com> | 2011-01-14 19:27:32 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-01-14 19:27:32 -0800 |
| commit | a7393dd66f0127c8acdd5f8928b0c2d0de602275 (patch) | |
| tree | 874fa7e64d5c1bc8755ddf88b8aafe1d2171ed69 /include/surfaceflinger | |
| parent | e7df0ddee486f4705b17b4d8ed57ddbeb8b71943 (diff) | |
| parent | afc724b907336c043a38487fb5620074c9777d45 (diff) | |
| download | frameworks_base-a7393dd66f0127c8acdd5f8928b0c2d0de602275.zip frameworks_base-a7393dd66f0127c8acdd5f8928b0c2d0de602275.tar.gz frameworks_base-a7393dd66f0127c8acdd5f8928b0c2d0de602275.tar.bz2 | |
Merge "Fix error reporting in Surface::cancelBuffer()" into honeycomb
Diffstat (limited to 'include/surfaceflinger')
| -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; } |