diff --git a/include/gui/BufferQueue.h b/include/gui/BufferQueue.h
index 008df35..6c38cde 100644
--- a/include/gui/BufferQueue.h
+++ b/include/gui/BufferQueue.h
@@ -143,8 +143,7 @@
     //
     // This method will fail if the connect was previously called on the
     // BufferQueue and no corresponding disconnect call was made.
-    virtual status_t connect(int api,
-            uint32_t* outWidth, uint32_t* outHeight, uint32_t* outTransform);
+    virtual status_t connect(int api, QueueBufferOutput* output);
 
     // disconnect attempts to disconnect a producer client API from the
     // BufferQueue. Calling this method will cause any subsequent calls to other
diff --git a/include/gui/ISurfaceTexture.h b/include/gui/ISurfaceTexture.h
index 0b4d099..929eda2 100644
--- a/include/gui/ISurfaceTexture.h
+++ b/include/gui/ISurfaceTexture.h
@@ -153,8 +153,7 @@
     // outWidth, outHeight and outTransform are filled with the default width
     // and height of the window and current transform applied to buffers,
     // respectively.
-    virtual status_t connect(int api,
-            uint32_t* outWidth, uint32_t* outHeight, uint32_t* outTransform) = 0;
+    virtual status_t connect(int api, QueueBufferOutput* output) = 0;
 
     // disconnect attempts to disconnect a client API from the SurfaceTexture.
     // Calling this method will cause any subsequent calls to other