Refactor graphics environment initialization

Put all of the setupGraphicsSupport-related code into one function so
its easier to follow the full logic, and less intrusive to the code
around the call-site. This isn't supposed to change behavior at all,
but is preparation for the next change which will.

Bug: 38215658
Test: launch Clock, observe relevant events in systrace
Change-Id: I157b6233c0e9daf65e41697b504aa7e7d684401c

1 files changed, 14 insertions, 12 deletions

diff --git a/core/java/android/os/GraphicsEnvironment.java b/core/java/android/os/GraphicsEnvironment.java
index f9eaba921cc1..a204c84819a5 100644
--- a/core/java/android/os/GraphicsEnvironment.java
+++ b/core/java/android/os/GraphicsEnvironment.java
@@ -37,18 +37,7 @@ public final class GraphicsEnvironment {
 
     public static void setupGraphicsEnvironment(Context context) {
         chooseDriver(context);
-
-        // Now that we've figured out which driver to use for this process, load and initialize it.
-        // This can take multiple frame periods, and it would otherwise happen as part of the first
-        // frame, increasing first-frame latency. Starting it here, as a low-priority background
-        // thread, means that it's usually done long before we start drawing the first frame,
-        // without significantly disrupting other activity launch work.
-        Thread eglInitThread = new Thread(
-                () -> {
-                    EGL14.eglGetDisplay(EGL14.EGL_DEFAULT_DISPLAY);
-                },
-                "EGL Init");
-        eglInitThread.start();
+        earlyInitEGL();
     }
 
     private static void chooseDriver(Context context) {
@@ -101,6 +90,19 @@ public final class GraphicsEnvironment {
         setDriverPath(paths);
     }
 
+    private static void earlyInitEGL() {
+        // Once we've figured out which driver to use for this process, load and initialize it.
+        // This can take multiple frame periods, and it would otherwise happen as part of the first
+        // frame, increasing first-frame latency. Starting it here means that it's usually done
+        // long before we start drawing the first frame.
+        Thread eglInitThread = new Thread(
+                () -> {
+                    EGL14.eglGetDisplay(EGL14.EGL_DEFAULT_DISPLAY);
+                },
+                "EGL Init");
+        eglInitThread.start();
+    }
+
     private static String chooseAbi(ApplicationInfo ai) {
         String isa = VMRuntime.getCurrentInstructionSet();
         if (ai.primaryCpuAbi != null &&