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

Commit fcd3c57e authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Don't attempt to preload fonts in isolated processes."

parents 592ca040 85ecae59

core/java/android/app/ActivityThread.java

+15 −13
Original line number Diff line number Diff line
@@ -5890,6 +5890,7 @@ public final class ActivityThread extends ClientTransactionHandler { 


        // Preload fonts resources

        FontsContract.setApplicationContextForResources(appContext);

        if (!Process.isIsolated()) {

            try {

                final ApplicationInfo info =

                        getPackageManager().getApplicationInfo(
@@ -5907,6 +5908,7 @@ public final class ActivityThread extends ClientTransactionHandler { 
                throw e.rethrowFromSystemServer();

            }

        }

    }



    /*package*/ final void finishInstrumentation(int resultCode, Bundle results) {

        IActivityManager am = ActivityManager.getService();