summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorJamie Gennis <jgennis@google.com>2011-08-18 14:31:39 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2011-08-18 14:31:39 -0700
commitc8f4c6a5d02d46eedd876bfc0be3468d6d4000e0 (patch)
tree91c045bb01ac5e5f0f7d46312b8e6ffa6f6b4b88 /include
parenta8993e10f9aca690722512d147d2f98ed29a3d75 (diff)
parent9b8fc65b0353db3a962ab52dc556c356d556fcc1 (diff)
downloadframeworks_base-c8f4c6a5d02d46eedd876bfc0be3468d6d4000e0.zip
frameworks_base-c8f4c6a5d02d46eedd876bfc0be3468d6d4000e0.tar.gz
frameworks_base-c8f4c6a5d02d46eedd876bfc0be3468d6d4000e0.tar.bz2
Merge "SurfaceTexture: fix queues-to-composer"
Diffstat (limited to 'include')
-rw-r--r--include/surfaceflinger/ISurfaceComposer.h5
1 files changed, 3 insertions, 2 deletions
diff --git a/include/surfaceflinger/ISurfaceComposer.h b/include/surfaceflinger/ISurfaceComposer.h
index dba98a3..6b31ca4 100644
--- a/include/surfaceflinger/ISurfaceComposer.h
+++ b/include/surfaceflinger/ISurfaceComposer.h
@@ -132,9 +132,10 @@ public:
virtual status_t turnElectronBeamOff(int32_t mode) = 0;
virtual status_t turnElectronBeamOn(int32_t mode) = 0;
- /* verify that an ISurface was created by SurfaceFlinger.
+ /* verify that an ISurfaceTexture was created by SurfaceFlinger.
*/
- virtual bool authenticateSurface(const sp<ISurface>& surface) const = 0;
+ virtual bool authenticateSurfaceTexture(
+ const sp<ISurfaceTexture>& surface) const = 0;
};
// ----------------------------------------------------------------------------