commit c09cec7ba6df108b91d9d9583b340580bafa5d0b
author Pierre Couillaud <pierre@broadcom.com> Thu Jul 03 10:55:00 2014 -0700
committer Eino-Ville Talvala <etalvala@google.com> Mon Jul 07 13:13:38 2014 -0700
tree 27264007890e4a178b78013ad888220ba9640eb2
parent 7f44751f95e722f7c628652bdacfa2bb5f510591

av: native_window_set_buffers_geometry is deprecated.

native_window_set_buffers_geometry is deprecated, but
__set_buffers_geometry is still used for device1 camera
support.

replace deprecated call with its equivalent combination of
native_window_set_buffers_dimensions and
native_window_set_buffers_format.

Change-Id: I4940367dcae6049451508bfdfc11c16907ec1afc
Signed-off-by: Pierre Couillaud <pierre@broadcom.com>

services/camera/libcameraservice/device1/CameraHardwareInterface.h

diff --git a/services/camera/libcameraservice/device1/CameraHardwareInterface.h b/services/camera/libcameraservice/device1/CameraHardwareInterface.h
index 925b645..2746f6f 100644
--- a/services/camera/libcameraservice/device1/CameraHardwareInterface.h
+++ b/services/camera/libcameraservice/device1/CameraHardwareInterface.h
@@ -625,9 +625,14 @@
     static int __set_buffers_geometry(struct preview_stream_ops* w,
                       int width, int height, int format)
     {
+        int rc;
         ANativeWindow *a = anw(w);
-        return native_window_set_buffers_geometry(a,
-                          width, height, format);
+
+        rc = native_window_set_buffers_dimensions(a, width, height);
+        if (!rc) {
+            rc = native_window_set_buffers_format(a, format);
+        }
+        return rc;
     }
 
     static int __set_crop(struct preview_stream_ops *w,