summaryrefslogtreecommitdiff
path: root/libs/gui/Surface.cpp
diff options
context:
space:
mode:
authortedbo <tedbo@google.com>2011-06-23 14:45:30 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2011-06-23 14:45:30 -0700
commit901b41614f111c862c5d44f1c30e0af191b0bb6f (patch)
tree0a52a8c2c9998319d44e4f23cbd1e0aefcc67340 /libs/gui/Surface.cpp
parentf43777a930992e5c8793c16b1a35a66513c47665 (diff)
parent1e7fa9e945d98eab76ff92f37c25040429a6c0a0 (diff)
Merge "Add method to create a ParcelSurfaceTexture from android.view.Surface."
Diffstat (limited to 'libs/gui/Surface.cpp')
-rw-r--r--libs/gui/Surface.cpp4
1 files changed, 4 insertions, 0 deletions
diff --git a/libs/gui/Surface.cpp b/libs/gui/Surface.cpp
index 4d1d923a42..9185e1e993 100644
--- a/libs/gui/Surface.cpp
+++ b/libs/gui/Surface.cpp
@@ -421,6 +421,10 @@ status_t Surface::validate(bool inCancelBuffer) const
return NO_ERROR;
}
+sp<ISurfaceTexture> Surface::getSurfaceTexture() {
+ return mSurface != NULL ? mSurface->getSurfaceTexture() : NULL;
+}
+
sp<IBinder> Surface::asBinder() const {
return mSurface!=0 ? mSurface->asBinder() : 0;
}