diff options
| author | Eino-Ville Talvala <etalvala@google.com> | 2014-07-07 22:27:58 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-07-06 02:28:07 +0000 |
| commit | 2e8863b31e987f9bb54e52645e03e75120863a2e (patch) | |
| tree | 705192d687cafae0bdc317e9b31ae6aa4e9d0388 /services | |
| parent | c98bd8d9bf81663b5cd9c79e79d6e7869c1146e6 (diff) | |
| parent | c09cec7ba6df108b91d9d9583b340580bafa5d0b (diff) | |
| download | frameworks_av-2e8863b31e987f9bb54e52645e03e75120863a2e.zip frameworks_av-2e8863b31e987f9bb54e52645e03e75120863a2e.tar.gz frameworks_av-2e8863b31e987f9bb54e52645e03e75120863a2e.tar.bz2 | |
Merge "av: native_window_set_buffers_geometry is deprecated."
Diffstat (limited to 'services')
| -rw-r--r-- | services/camera/libcameraservice/device1/CameraHardwareInterface.h | 9 |
1 files changed, 7 insertions, 2 deletions
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 @@ private: 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, |