Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1b98a9e6 authored by Mathias Agopian's avatar Mathias Agopian Committed by Android Git Automerger
Browse files

am 5219dd8e: Merge "add format parameter to setBufferGeometry" into gingerbread

parents d9588e9c 5219dd8e

native/android/native_window.cpp

+2 −2
Original line number Diff line number Diff line
@@ -58,8 +58,8 @@ int32_t ANativeWindow_getFormat(ANativeWindow* window) { 
}



int32_t ANativeWindow_setBuffersGeometry(ANativeWindow* window, int32_t width,

        int32_t height) {

    native_window_set_buffers_geometry(window, width, height, 0);

        int32_t height, int32_t format) {

    native_window_set_buffers_geometry(window, width, height, format);

    return 0;

}

native/include/android/native_window.h

+1 −1
Original line number Diff line number Diff line
@@ -96,7 +96,7 @@ int32_t ANativeWindow_getFormat(ANativeWindow* window); 
 * For all of these parameters, if 0 is supplied then the window's base

 * value will come back in force.

 */

int32_t ANativeWindow_setBuffersGeometry(ANativeWindow* window, int32_t width, int32_t height);

int32_t ANativeWindow_setBuffersGeometry(ANativeWindow* window, int32_t width, int32_t height, int32_t format);



/**

 * Lock the window's next drawing surface for writing.