Refactoring: Rename SurfaceTextureClient to Surface

Change-Id: If4d56220d57d866b2f914753ef1cf8396ca7a961

5 files changed, 9 insertions, 9 deletions

diff --git a/test/CameraHal/camera_test_bufferqueue.h b/test/CameraHal/camera_test_bufferqueue.h
index 2002447..0dcb886 100644
--- a/test/CameraHal/camera_test_bufferqueue.h
+++ b/test/CameraHal/camera_test_bufferqueue.h
@@ -127,7 +127,7 @@ public:
                   BufferSourceInput(camera), mTexId(tex_id) {
         mBufferQueue = new BufferQueue(true, 1);
         sp<IGraphicBufferProducer> bufferProducer = mBufferQueue;
-        mWindowTapIn = new SurfaceTextureClient(bufferProducer);
+        mWindowTapIn = new Surface(bufferProducer);
         mCamera->setBufferSource(mBufferQueue, NULL);
     }
     virtual ~BQ_BufferSourceInput() {
diff --git a/test/CameraHal/camera_test_menu.cpp b/test/CameraHal/camera_test_menu.cpp
index 877edb5..034d684 100644
--- a/test/CameraHal/camera_test_menu.cpp
+++ b/test/CameraHal/camera_test_menu.cpp
@@ -13,7 +13,7 @@
 #include <ui/DisplayInfo.h>
 
 #include <gui/GLConsumer.h>
-#include <gui/SurfaceTextureClient.h>
+#include <gui/Surface.h>
 #include <ui/GraphicBuffer.h>
 
 #include <camera/Camera.h>
diff --git a/test/CameraHal/camera_test_surfacetexture.cpp b/test/CameraHal/camera_test_surfacetexture.cpp
index 264afc4..285cc51 100644
--- a/test/CameraHal/camera_test_surfacetexture.cpp
+++ b/test/CameraHal/camera_test_surfacetexture.cpp
@@ -11,7 +11,7 @@
 #include <math.h>
 
 #include <gui/GLConsumer.h>
-#include <gui/SurfaceTextureClient.h>
+#include <gui/Surface.h>
 #include <ui/GraphicBuffer.h>
 #include <ui/GraphicBufferMapper.h>
 
@@ -502,7 +502,7 @@ sp<GLConsumer> SurfaceTextureBase::getST() {
 void SurfaceTextureBase::initialize(int tex_id, EGLenum tex_target) {
     mTexId = tex_id;
     mST = new GLConsumer(tex_id, true, tex_target);
-    mSTC = new SurfaceTextureClient(mST);
+    mSTC = new Surface(mST);
     mANW = mSTC;
 }
 
diff --git a/test/CameraHal/camera_test_surfacetexture.h b/test/CameraHal/camera_test_surfacetexture.h
index bc51454..dbf6e31 100644
--- a/test/CameraHal/camera_test_surfacetexture.h
+++ b/test/CameraHal/camera_test_surfacetexture.h
@@ -103,7 +103,7 @@ public:
 
 protected:
     sp<GLConsumer> mST;
-    sp<SurfaceTextureClient> mSTC;
+    sp<Surface> mSTC;
     sp<ANativeWindow> mANW;
     int mTexId;
 };
@@ -206,7 +206,7 @@ public:
         surface_texture = mSurfaceTexture->getST();
         surface_texture->setSynchronousMode(true);
 
-        mWindowTapIn = new SurfaceTextureClient(surface_texture);
+        mWindowTapIn = new Surface(surface_texture);
 #ifndef ANDROID_API_JB_OR_LATER
         mCamera->setBufferSource(mSurfaceTexture->getST(), NULL);
 #else
diff --git a/test/CameraHal/surfacetexture_test.cpp b/test/CameraHal/surfacetexture_test.cpp
index fdec0ad..2a96eea 100644
--- a/test/CameraHal/surfacetexture_test.cpp
+++ b/test/CameraHal/surfacetexture_test.cpp
@@ -42,7 +42,7 @@
 #include <climits>
 
 #include <gui/GLConsumer.h>
-#include <gui/SurfaceTextureClient.h>
+#include <gui/Surface.h>
 #include <ui/GraphicBuffer.h>
 #include <ui/GraphicBufferMapper.h>
 
@@ -112,7 +112,7 @@ static void
 test_format (int format, int page_mode, int width, int height)
 {
     sp<GLConsumer> st;
-    SurfaceTextureClient *stc;
+    Surface *stc;
     GLint tex_id = 0;
     sp<ANativeWindow> anw;
     ANativeWindowBuffer* anb[30] = { 0 };
@@ -126,7 +126,7 @@ test_format (int format, int page_mode, int width, int height)
 
     st->setDefaultBufferSize (width, height);
 
-    stc = new SurfaceTextureClient(st);
+    stc = new Surface(st);
     anw = stc;
 
     usage = GRALLOC_USAGE_SW_READ_RARELY |