summaryrefslogtreecommitdiffstats
path: root/native/include/android
diff options
context:
space:
mode:
authorMathias Agopian <mathias@google.com>2010-10-26 12:23:53 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2010-10-26 12:23:53 -0700
commit49d1735482dbcb017775b1807847e943f0a5152c (patch)
tree6dc2bff4637ec52f036d570d4feef985e38f2dd2 /native/include/android
parent324be170219987d643c1d05701a00cd358bc03e2 (diff)
parent1b98a9e6a9bd22c4dca731491b701f7ece6a6eb7 (diff)
downloadframeworks_base-49d1735482dbcb017775b1807847e943f0a5152c.zip
frameworks_base-49d1735482dbcb017775b1807847e943f0a5152c.tar.gz
frameworks_base-49d1735482dbcb017775b1807847e943f0a5152c.tar.bz2
am 1b98a9e6: am 5219dd8e: Merge "add format parameter to setBufferGeometry" into gingerbread
Diffstat (limited to 'native/include/android')
-rw-r--r--native/include/android/native_window.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/native/include/android/native_window.h b/native/include/android/native_window.h
index ad03d0e..f3d7550 100644
--- a/native/include/android/native_window.h
+++ b/native/include/android/native_window.h
@@ -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.