commit d47f7d8b5fe3a3861d7cbdc5f912235407823c8e
author Andy McFadden <fadden@android.com> Tue Dec 18 09:48:38 2012 -0800
committer Andy McFadden <fadden@android.com> Tue Dec 18 11:22:21 2012 -0800
tree b4c4e636bac379ded38550ade39e39c2d86467ea
parent 4e7ec240cabbdf3ac9776a691be0a46ea4e2e69e

Rename ISurfaceTexture and SurfaceTexture

The C++ class names don't match what the classes do, so rename
ISurfaceTexture to IGraphicBufferProducer, and SurfaceTexture to
GLConsumer.

Bug 7736700

Change-Id: I08e677faf2ebb418ef131d0a8008e01037db0e50

core/jni/android_hardware_Camera.cpp

diff --git a/core/jni/android_hardware_Camera.cpp b/core/jni/android_hardware_Camera.cpp
index d39f565c..0e0893b 100644
--- a/core/jni/android_hardware_Camera.cpp
+++ b/core/jni/android_hardware_Camera.cpp
@@ -27,7 +27,7 @@
 #include <cutils/properties.h>
 #include <utils/Vector.h>
 
-#include <gui/SurfaceTexture.h>
+#include <gui/GLConsumer.h>
 #include <gui/Surface.h>
 #include <camera/Camera.h>
 #include <binder/IMemory.h>
@@ -555,7 +555,7 @@
 
     sp<BufferQueue> bufferQueue = NULL;
     if (jSurfaceTexture != NULL) {
-        sp<SurfaceTexture> surfaceTexture =
+        sp<GLConsumer> surfaceTexture =
             SurfaceTexture_getSurfaceTexture(env, jSurfaceTexture);
         if (surfaceTexture != NULL) {
             bufferQueue = surfaceTexture->getBufferQueue();