summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTomeu Vizoso <tomeu.vizoso@collabora.com>2017-04-28 10:41:12 -0400
committerRobert Foss <robert.foss@collabora.com>2017-04-28 10:42:15 -0400
commit8d169987be803870029633537c89676e1bf55c6f (patch)
treeafcb0610644693c922506a30a1f8bbf2833406b6
parent7261a926a5b6b08a35d937bb922651a5d7f7e725 (diff)
downloadandroid-frameworks-base-8d169987be803870029633537c89676e1bf55c6f.tar.gz
android-frameworks-base-8d169987be803870029633537c89676e1bf55c6f.tar.xz
HACK: Disable eglTerminate in AssetAtlasService
-rw-r--r--services/core/jni/com_android_server_AssetAtlasService.cpp5
1 files changed, 2 insertions, 3 deletions
diff --git a/services/core/jni/com_android_server_AssetAtlasService.cpp b/services/core/jni/com_android_server_AssetAtlasService.cpp
index ed79ceb..1ad5e88 100644
--- a/services/core/jni/com_android_server_AssetAtlasService.cpp
+++ b/services/core/jni/com_android_server_AssetAtlasService.cpp
@@ -58,7 +58,6 @@ namespace android {
if (context != EGL_NO_CONTEXT) eglDestroyContext(display, context); \
eglMakeCurrent(display, EGL_NO_SURFACE, EGL_NO_SURFACE, EGL_NO_CONTEXT); \
eglReleaseThread(); \
- eglTerminate(display); \
return result;
static jboolean com_android_server_AssetAtlasService_upload(JNIEnv* env, jobject,
@@ -100,13 +99,13 @@ static jboolean com_android_server_AssetAtlasService_upload(JNIEnv* env, jobject
if (!eglChooseConfig(display, configAttrs, configs, 1, &configCount)) {
ALOGW("Could not select EGL configuration");
eglReleaseThread();
- eglTerminate(display);
+ //eglTerminate(display);
return JNI_FALSE;
}
if (configCount <= 0) {
ALOGW("Could not find EGL configuration");
eglReleaseThread();
- eglTerminate(display);
+ //eglTerminate(display);
return JNI_FALSE;
}