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 | b353fd9746bc7d5d438bad47a0ad08f6a11d8d40 (patch) | |
| tree | 76c9c91a362ef0651849bb20b2c5a6fc583ad97c /include/surfaceflinger | |
| parent | e58a41aa4d0f580113e50d46b0665c8a8e2da232 (diff) | |
| parent | a317f1ba7f71fe04d524f46dbdc6e2419b7f75a3 (diff) | |
| download | frameworks_native-b353fd9746bc7d5d438bad47a0ad08f6a11d8d40.zip frameworks_native-b353fd9746bc7d5d438bad47a0ad08f6a11d8d40.tar.gz frameworks_native-b353fd9746bc7d5d438bad47a0ad08f6a11d8d40.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; } |