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

Commit 6e1ac796 authored by Jesse Hall's avatar Jesse Hall Committed by Android (Google) Code Review
Browse files

Merge changes I101e5578,I157b6233 

* changes:
  Init EGL only for HW-accelerated Activities
  Refactor graphics environment initialization
parents 380a6c25 c37984f1

core/java/android/app/ActivityThread.java

+55 −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);
@@ -2887,6 +2890,9 @@ public final class ActivityThread { 
            TAG, "Handling launch of " + r);



        // Initialize before creating the activity

        if (!ThreadedRenderer.sRendererDisabled) {

            GraphicsEnvironment.earlyInitEGL();

        }

        WindowManagerGlobal.initialize();



        Activity a = performLaunchActivity(r, customIntent);
@@ -5372,28 +5378,47 @@ 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");

            }

        }



        GraphicsEnvironment.chooseDriver(context);

        Trace.traceEnd(Trace.TRACE_TAG_ACTIVITY_MANAGER);

    }



    private void updateDefaultDensity() {

        final int densityDpi = mCurDefaultDisplayDpi;

        if (!mDensityCompatMode
@@ -5664,27 +5689,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

+27 −17
Original line number Diff line number Diff line
@@ -35,23 +35,12 @@ public final class GraphicsEnvironment { 
    private static final String TAG = "GraphicsEnvironment";

    private static final String PROPERTY_GFX_DRIVER = "ro.gfx.driver.0";



    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();

    }



    private static void chooseDriver(Context context) {

    /**

     * Choose whether the current process should use the builtin or an updated driver.

     *

     * @hide

     */

    public static void chooseDriver(Context context) {

        String driverPackageName = SystemProperties.get(PROPERTY_GFX_DRIVER);

        if (driverPackageName == null || driverPackageName.isEmpty()) {

            return;
@@ -101,6 +90,27 @@ public final class GraphicsEnvironment { 
        setDriverPath(paths);

    }



    /**

     * Start a background thread to initialize EGL.

     *

     * Initializing EGL involves loading and initializing the graphics driver. Some drivers take

     * several 10s of milliseconds to do this, so doing it on-demand when an app tries to render

     * its first frame adds directly to user-visible app launch latency. By starting it earlier

     * on a separate thread, it can usually be finished well before the UI is ready to be drawn.

     *

     * Should only be called after chooseDriver().

     *

     * @hide

     */

    public static void earlyInitEGL() {

        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 &&