diff options
| author | Mathias Agopian <mathias@google.com> | 2013-02-21 23:21:20 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-02-21 23:21:21 +0000 |
| commit | ee9cc423e2551ffbacfd226b8627737beabaec99 (patch) | |
| tree | b210a4f6f36ab0a6798db09baf44eadb62261231 /services | |
| parent | 3706fe79df688b84125c79838a4eeeaa11640022 (diff) | |
| parent | a6843669d4da47755ce97fb85389d4d1c52b8197 (diff) | |
| download | frameworks_av-ee9cc423e2551ffbacfd226b8627737beabaec99.zip frameworks_av-ee9cc423e2551ffbacfd226b8627737beabaec99.tar.gz frameworks_av-ee9cc423e2551ffbacfd226b8627737beabaec99.tar.bz2 | |
Merge "replace getISurfaceTexture by getIGraphicBufferProducer"
Diffstat (limited to 'services')
| -rw-r--r-- | services/camera/libcameraservice/Camera2Client.cpp | 2 | ||||
| -rw-r--r-- | services/camera/libcameraservice/CameraClient.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/services/camera/libcameraservice/Camera2Client.cpp b/services/camera/libcameraservice/Camera2Client.cpp index b9feaf8..e8b3b7f 100644 --- a/services/camera/libcameraservice/Camera2Client.cpp +++ b/services/camera/libcameraservice/Camera2Client.cpp @@ -488,7 +488,7 @@ status_t Camera2Client::setPreviewDisplay( sp<IBinder> binder; sp<ANativeWindow> window; if (surface != 0) { - binder = surface->getISurfaceTexture()->asBinder(); + binder = surface->getIGraphicBufferProducer()->asBinder(); window = surface; } diff --git a/services/camera/libcameraservice/CameraClient.cpp b/services/camera/libcameraservice/CameraClient.cpp index 5f03a1c..f67c9f4 100644 --- a/services/camera/libcameraservice/CameraClient.cpp +++ b/services/camera/libcameraservice/CameraClient.cpp @@ -301,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->getISurfaceTexture()->asBinder() : 0); + sp<IBinder> binder(surface != 0 ? surface->getIGraphicBufferProducer()->asBinder() : 0); sp<ANativeWindow> window(surface); return setPreviewWindow(binder, window); } |