Merge "libhwui: avoid creating GPU context in Zygote"

1 files changed, 6 insertions, 3 deletions

diff --git a/libs/hwui/renderthread/RenderThread.cpp b/libs/hwui/renderthread/RenderThread.cpp
index 565fb61c8994..bea6121905a5 100644
--- a/libs/hwui/renderthread/RenderThread.cpp
+++ b/libs/hwui/renderthread/RenderThread.cpp
@@ -162,6 +162,7 @@ void RenderThread::initializeChoreographer() {
 }
 
 void RenderThread::initThreadLocals() {
+    HardwareBitmapUploader::initialize();
     setupFrameInterval();
     initializeChoreographer();
     mEglManager = new EglManager();
@@ -390,10 +391,12 @@ void RenderThread::preload() {
     if (Properties::getRenderPipelineType() == RenderPipelineType::SkiaGL) {
         std::thread eglInitThread([]() { eglGetDisplay(EGL_DEFAULT_DISPLAY); });
         eglInitThread.detach();
-    } else {
-        requireVkContext();
     }
-    HardwareBitmapUploader::initialize();
+    // TODO: uncomment only after http://b/135536511 is fixed.
+    // else {
+    //    uint32_t apiVersion;
+    //    vkEnumerateInstanceVersion(&apiVersion);
+    //}
 }
 
 } /* namespace renderthread */