Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 317fa5a9 authored by Jesse Hall's avatar Jesse Hall
Browse files

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
parent e16b83bb

core/java/android/app/ActivityThread.java

+52 −49
Original line number Diff line number Diff line
@@ -29,8 +29,8 @@ import android.content.ComponentName; 
import android.content.ContentProvider;

import android.content.Context;

import android.content.IContentProvider;

import android.content.Intent;

import android.content.IIntentReceiver;

import android.content.Intent;

import android.content.pm.ActivityInfo;

import android.content.pm.ApplicationInfo;

import android.content.pm.IPackageManager;
@@ -91,6 +91,7 @@ import android.provider.ContactsContract; 
import android.provider.Downloads;

import android.provider.FontsContract;

import android.provider.Settings;

import android.renderscript.RenderScriptCacheDir;

import android.security.NetworkSecurityPolicy;

import android.security.net.config.NetworkSecurityConfigProvider;

import android.util.AndroidRuntimeException;
@@ -114,7 +115,6 @@ import android.view.ViewRootImpl; 
import android.view.Window;

import android.view.WindowManager;

import android.view.WindowManagerGlobal;

import android.renderscript.RenderScriptCacheDir;

import android.webkit.WebView;



import com.android.internal.annotations.GuardedBy;
@@ -128,8 +128,21 @@ import com.android.internal.util.ArrayUtils; 
import com.android.internal.util.FastPrintWriter;

import com.android.org.conscrypt.OpenSSLSocketImpl;

import com.android.org.conscrypt.TrustedCertificateStore;



import dalvik.system.BaseDexClassLoader;

import dalvik.system.CloseGuard;

import dalvik.system.VMDebug;

import dalvik.system.VMRuntime;



import com.google.android.collect.Lists;



import libcore.io.DropBox;

import libcore.io.EventLogger;

import libcore.io.IoUtils;

import libcore.net.event.NetworkEventDispatcher;



import org.apache.harmony.dalvik.ddmc.DdmVmInternal;



import java.io.File;

import java.io.FileDescriptor;

import java.io.FileOutputStream;
@@ -146,16 +159,6 @@ import java.util.Map; 
import java.util.Objects;

import java.util.TimeZone;



import libcore.io.DropBox;

import libcore.io.EventLogger;

import libcore.io.IoUtils;

import libcore.net.event.NetworkEventDispatcher;

import dalvik.system.BaseDexClassLoader;

import dalvik.system.CloseGuard;

import dalvik.system.VMDebug;

import dalvik.system.VMRuntime;

import org.apache.harmony.dalvik.ddmc.DdmVmInternal;



final class RemoteServiceException extends AndroidRuntimeException {

    public RemoteServiceException(String msg) {

        super(msg);
@@ -5371,26 +5374,45 @@ public final class ActivityThread { 
        WindowManagerGlobal.getInstance().trimMemory(level);

    }



    private void setupGraphicsSupport(Context context, File cacheDir) {

        if (Process.isIsolated()) {

            // Isolated processes aren't going to do UI.

            return;

        }

    private void setupGraphicsSupport(Context context) {

        Trace.traceBegin(Trace.TRACE_TAG_ACTIVITY_MANAGER, "setupGraphicsSupport");



        // The system package doesn't have real data directories, so don't set up cache paths.

        if (!"android".equals(context.getPackageName())) {

            // This cache location probably points at credential-encrypted

            // storage which may not be accessible yet; assign it anyway instead

            // of pointing at device-encrypted storage.

            final File cacheDir = context.getCacheDir();

            if (cacheDir != null) {

                // Provide a usable directory for temporary files

                System.setProperty("java.io.tmpdir", cacheDir.getAbsolutePath());

            } else {

                Log.v(TAG, "Unable to initialize \"java.io.tmpdir\" property "

                        + "due to missing cache directory");

            }



            // Setup a location to store generated/compiled graphics code.

            final Context deviceContext = context.createDeviceProtectedStorageContext();

            final File codeCacheDir = deviceContext.getCodeCacheDir();

            if (codeCacheDir != null) {

                try {

                    int uid = Process.myUid();

                    String[] packages = getPackageManager().getPackagesForUid(uid);



                    if (packages != null) {

                        ThreadedRenderer.setupDiskCache(cacheDir);

                        RenderScriptCacheDir.setupDiskCache(cacheDir);

                        GraphicsEnvironment.setupGraphicsEnvironment(context);

                    }

                } catch (RemoteException e) {

            throw e.rethrowFromSystemServer();

        } finally {

                    Trace.traceEnd(Trace.TRACE_TAG_ACTIVITY_MANAGER);

                    throw e.rethrowFromSystemServer();

                }

            } else {

                Log.w(TAG, "Unable to use shader/script cache: missing code-cache directory");

            }

        }



        Trace.traceEnd(Trace.TRACE_TAG_ACTIVITY_MANAGER);

    }



    private void updateDefaultDensity() {
@@ -5663,27 +5685,8 @@ public final class ActivityThread { 
        updateLocaleListFromAppContext(appContext,

                mResourcesManager.getConfiguration().getLocales());



        if (!Process.isIsolated() && !"android".equals(appContext.getPackageName())) {

            // This cache location probably points at credential-encrypted

            // storage which may not be accessible yet; assign it anyway instead

            // of pointing at device-encrypted storage.

            final File cacheDir = appContext.getCacheDir();

            if (cacheDir != null) {

                // Provide a usable directory for temporary files

                System.setProperty("java.io.tmpdir", cacheDir.getAbsolutePath());

            } else {

                Log.v(TAG, "Unable to initialize \"java.io.tmpdir\" property "

                        + "due to missing cache directory");

            }



            // Setup a location to store generated/compiled graphics code.

            final Context deviceContext = appContext.createDeviceProtectedStorageContext();

            final File codeCacheDir = deviceContext.getCodeCacheDir();

            if (codeCacheDir != null) {

                setupGraphicsSupport(appContext, codeCacheDir);

            } else {

                Log.e(TAG, "Unable to setupGraphicsSupport due to missing code-cache directory");

            }

        if (!Process.isIsolated()) {

            setupGraphicsSupport(appContext);

        }



        // If we use profiles, setup the dex reporter to notify package manager

core/java/android/os/GraphicsEnvironment.java

+14 −12
Original line number Diff line number Diff line
@@ -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 &&