diff options
| author | David Turner <digit@android.com> | 2014-04-14 14:41:39 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-04-14 14:41:39 +0000 |
| commit | e6061110d4851fc16f6ca4a7115cfa1953c10030 (patch) | |
| tree | 98371400b65c4ed324eba14155d2f45a8de7fe03 | |
| parent | 126dd2f91f8c3b2fbe0ead8e35419156c95bff0a (diff) | |
| parent | 61a8f0bbc146a4050a885e1e7c314dfc4ab72779 (diff) | |
| download | android_device_generic_goldfish-e6061110d4851fc16f6ca4a7115cfa1953c10030.tar.gz android_device_generic_goldfish-e6061110d4851fc16f6ca4a7115cfa1953c10030.tar.bz2 android_device_generic_goldfish-e6061110d4851fc16f6ca4a7115cfa1953c10030.zip | |
am 61a8f0bb: Merge "Fix the Chrome app crash in emulator issue"
* commit '61a8f0bbc146a4050a885e1e7c314dfc4ab72779':
Fix the Chrome app crash in emulator issue
| -rw-r--r-- | opengl/system/OpenglSystemCommon/ThreadInfo.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/opengl/system/OpenglSystemCommon/ThreadInfo.cpp b/opengl/system/OpenglSystemCommon/ThreadInfo.cpp index 75da8f2..f9c8521 100644 --- a/opengl/system/OpenglSystemCommon/ThreadInfo.cpp +++ b/opengl/system/OpenglSystemCommon/ThreadInfo.cpp @@ -24,6 +24,7 @@ static void tlsDestruct(void *ptr) EGLThreadInfo *ti = (EGLThreadInfo *)ptr; delete ti->hostConn; delete ti; + ((intptr_t *)__get_tls())[TLS_SLOT_OPENGL] = NULL; } } |