am bbc46ae7: am 544f89ae: Update SurfaceTexture interface for forward compatibility

* commit 'bbc46ae7499bc0fa67612c67dd23c1758336c935':
  Update SurfaceTexture interface for forward compatibility

2 files changed, 9 insertions, 2 deletions

diff --git a/include/gui/SurfaceTexture.h b/include/gui/SurfaceTexture.h
index a8c76725e7c9..511b3eccb7e7 100644
--- a/include/gui/SurfaceTexture.h
+++ b/include/gui/SurfaceTexture.h
@@ -38,6 +38,12 @@ namespace android {
 class IGraphicBufferAlloc;
 class String8;
 
+class BufferQueue : public RefBase {
+public:
+    BufferQueue(bool allowSynchronousMode) {};
+    status_t setBufferCount(int bufferCount) { return 0; }
+};
+
 class SurfaceTexture : public BnSurfaceTexture {
 public:
     enum { MIN_UNDEQUEUED_BUFFERS = 2 };
@@ -69,7 +75,8 @@ public:
     // fences should be used to synchronize access to buffers if that behavior
     // is enabled at compile-time.
     SurfaceTexture(GLuint tex, bool allowSynchronousMode = true,
-            GLenum texTarget = GL_TEXTURE_EXTERNAL_OES, bool useFenceSync = true);
+            GLenum texTarget = GL_TEXTURE_EXTERNAL_OES, bool useFenceSync = true,
+            const sp<BufferQueue> &bufferQueue = 0);
 
     virtual ~SurfaceTexture();
 
diff --git a/libs/gui/SurfaceTexture.cpp b/libs/gui/SurfaceTexture.cpp
index c80d93d7512c..5a643d3c975c 100644
--- a/libs/gui/SurfaceTexture.cpp
+++ b/libs/gui/SurfaceTexture.cpp
@@ -115,7 +115,7 @@ static int32_t createProcessUniqueId() {
 }
 
 SurfaceTexture::SurfaceTexture(GLuint tex, bool allowSynchronousMode,
-        GLenum texTarget, bool useFenceSync) :
+        GLenum texTarget, bool useFenceSync, const sp<BufferQueue> &bufferQueue) :
     mDefaultWidth(1),
     mDefaultHeight(1),
     mPixelFormat(PIXEL_FORMAT_RGBA_8888),