diff options
| author | Mathias Agopian <mathias@google.com> | 2013-02-14 17:11:27 -0800 |
|---|---|---|
| committer | Mathias Agopian <mathias@google.com> | 2013-02-15 12:47:35 -0800 |
| commit | 1a2952aee048ca7b1765e2bc09ebe9aeddaeafa3 (patch) | |
| tree | 8e63f996a20f020e0af736eab89d632204c2c631 /services/camera/libcameraservice/CameraClient.cpp | |
| parent | 05f625c46b992ab66b8d1527a366fe2746b4e3c7 (diff) | |
| download | frameworks_av-1a2952aee048ca7b1765e2bc09ebe9aeddaeafa3.zip frameworks_av-1a2952aee048ca7b1765e2bc09ebe9aeddaeafa3.tar.gz frameworks_av-1a2952aee048ca7b1765e2bc09ebe9aeddaeafa3.tar.bz2 | |
Refactoring: Rename SurfaceTextureClient to Surface
Change-Id: I4e8a8b20914cb64edc37abe68233fbc9f2b5d830
Diffstat (limited to 'services/camera/libcameraservice/CameraClient.cpp')
| -rw-r--r-- | services/camera/libcameraservice/CameraClient.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/services/camera/libcameraservice/CameraClient.cpp b/services/camera/libcameraservice/CameraClient.cpp index f9cee0d..5f03a1c 100644 --- a/services/camera/libcameraservice/CameraClient.cpp +++ b/services/camera/libcameraservice/CameraClient.cpp @@ -18,7 +18,6 @@ //#define LOG_NDEBUG 0 #include <cutils/properties.h> -#include <gui/SurfaceTextureClient.h> #include <gui/Surface.h> #include "CameraClient.h" @@ -302,7 +301,7 @@ status_t CameraClient::setPreviewWindow(const sp<IBinder>& binder, status_t CameraClient::setPreviewDisplay(const sp<Surface>& surface) { LOG1("setPreviewDisplay(%p) (pid %d)", surface.get(), getCallingPid()); - sp<IBinder> binder(surface != 0 ? surface->asBinder() : 0); + sp<IBinder> binder(surface != 0 ? surface->getISurfaceTexture()->asBinder() : 0); sp<ANativeWindow> window(surface); return setPreviewWindow(binder, window); } @@ -317,7 +316,7 @@ status_t CameraClient::setPreviewTexture( sp<ANativeWindow> window; if (bufferProducer != 0) { binder = bufferProducer->asBinder(); - window = new SurfaceTextureClient(bufferProducer); + window = new Surface(bufferProducer); } return setPreviewWindow(binder, window); } |