From 982d2da4eef0a48d84d88e3e1d2d1dbdbb413a27 Mon Sep 17 00:00:00 2001 From: Mathias Agopian Date: Fri, 29 Jul 2011 17:55:48 -0700 Subject: connect/disconnect is now called from our EGL wrapper the original connect/disconnect hooks are deprecated and replace by api_connect/api_disconnect. the original hooks are no no-ops. api_connect/api_disconnect is now only called from the android framework. Bug: 5057915 Change-Id: I8ca64cd1acd6cabf915bf54689ec2e5f6dfa495a --- services/camera/libcameraservice/CameraService.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'services/camera') diff --git a/services/camera/libcameraservice/CameraService.cpp b/services/camera/libcameraservice/CameraService.cpp index b03649e..def25d1 100644 --- a/services/camera/libcameraservice/CameraService.cpp +++ b/services/camera/libcameraservice/CameraService.cpp @@ -460,10 +460,10 @@ status_t CameraService::Client::connect(const sp& client) { static void disconnectWindow(const sp& window) { if (window != 0) { - status_t result = native_window_disconnect(window.get(), + status_t result = native_window_api_disconnect(window.get(), NATIVE_WINDOW_API_CAMERA); if (result != NO_ERROR) { - LOGW("native_window_disconnect failed: %s (%d)", strerror(-result), + LOGW("native_window_api_disconnect failed: %s (%d)", strerror(-result), result); } } @@ -526,9 +526,9 @@ status_t CameraService::Client::setPreviewWindow(const sp& binder, } if (window != 0) { - result = native_window_connect(window.get(), NATIVE_WINDOW_API_CAMERA); + result = native_window_api_connect(window.get(), NATIVE_WINDOW_API_CAMERA); if (result != NO_ERROR) { - LOGE("native_window_connect failed: %s (%d)", strerror(-result), + LOGE("native_window_api_connect failed: %s (%d)", strerror(-result), result); return result; } -- cgit v1.1