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

Commit 9bb4fac5 authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Don't fetch GameService during graphics setup if not a game" into main

parents 3a9e332a a5718a6b

core/java/android/os/GraphicsEnvironment.java

+5 −6
Original line number Diff line number Diff line
@@ -120,7 +120,6 @@ public class GraphicsEnvironment { 
    private ClassLoader mClassLoader;

    private String mLibrarySearchPaths;

    private String mLibraryPermittedPaths;

    private GameManager mGameManager;



    private int mAngleOptInIndex = -1;

    private boolean mShouldUseAngle = false;
@@ -134,8 +133,6 @@ public class GraphicsEnvironment { 
        final ApplicationInfo appInfoWithMetaData =

                getAppInfoWithMetadata(context, pm, packageName);



        mGameManager = context.getSystemService(GameManager.class);



        Trace.traceBegin(Trace.TRACE_TAG_GRAPHICS, "setupGpuLayers");

        setupGpuLayers(context, coreSettings, pm, packageName, appInfoWithMetaData);

        Trace.traceEnd(Trace.TRACE_TAG_GRAPHICS);
@@ -161,9 +158,11 @@ public class GraphicsEnvironment { 
        Trace.traceEnd(Trace.TRACE_TAG_GRAPHICS);



        Trace.traceBegin(Trace.TRACE_TAG_GRAPHICS, "notifyGraphicsEnvironmentSetup");

        if (mGameManager != null

                && appInfoWithMetaData.category == ApplicationInfo.CATEGORY_GAME) {

            mGameManager.notifyGraphicsEnvironmentSetup();

        if (appInfoWithMetaData.category == ApplicationInfo.CATEGORY_GAME) {

            final GameManager gameManager = context.getSystemService(GameManager.class);

            if (gameManager != null) {

                gameManager.notifyGraphicsEnvironmentSetup();

            }

        }

        Trace.traceEnd(Trace.TRACE_TAG_GRAPHICS);

    }