From 92df1283f7a8e186f04a93a1ec34d8f8fa3202ce Mon Sep 17 00:00:00 2001 From: Xavier Ducrohet Date: Tue, 19 Oct 2010 10:32:14 -0700 Subject: [PATCH 1/2] Move samples to API 9 Change-Id: I918a63197ff62d6b935de5a6eb843516a314a241 --- samples/source.properties | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/samples/source.properties b/samples/source.properties index 69d50d381..2afedc5b1 100644 --- a/samples/source.properties +++ b/samples/source.properties @@ -1,5 +1,5 @@ Pkg.UserSrc=false Pkg.Revision=1 -AndroidVersion.ApiLevel=8 -AndroidVersion.CodeName=gingerbread +AndroidVersion.ApiLevel=9 +#AndroidVersion.CodeName=gingerbread From 834eb602ebd904ec1cd6b5301106c97e67693b4c Mon Sep 17 00:00:00 2001 From: Dianne Hackborn Date: Tue, 19 Oct 2010 18:36:53 -0700 Subject: [PATCH 2/2] Fix bug in native activity demo. Can't get surface size until after it is made current. Change-Id: I34847775bde680d05767b6b4cfa8e547eb56aa6d --- ndk/platforms/android-9/samples/native-activity/jni/main.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/ndk/platforms/android-9/samples/native-activity/jni/main.c b/ndk/platforms/android-9/samples/native-activity/jni/main.c index 40c421ac4..9e95c205f 100644 --- a/ndk/platforms/android-9/samples/native-activity/jni/main.c +++ b/ndk/platforms/android-9/samples/native-activity/jni/main.c @@ -74,14 +74,15 @@ static int engine_init_display(struct engine* engine) { selectConfigForNativeWindow(display, attribs, engine->app->window, &config); surface = eglCreateWindowSurface(display, config, engine->app->window, NULL); context = eglCreateContext(display, config, NULL, NULL); - eglQuerySurface(display, surface, EGL_WIDTH, &w); - eglQuerySurface(display, surface, EGL_HEIGHT, &h); if (eglMakeCurrent(display, surface, surface, context) == EGL_FALSE) { LOGW("Unable to eglMakeCurrent"); return -1; } + eglQuerySurface(display, surface, EGL_WIDTH, &w); + eglQuerySurface(display, surface, EGL_HEIGHT, &h); + engine->display = display; engine->context = context; engine->surface = surface;