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

Commit 20de619d authored by Brian Carlstrom's avatar Brian Carlstrom Committed by Android (Google) Code Review
Browse files

Merge "Set threads' contextClassLoader during LoadedApk.makeApplication." into lmp-dev

parents 36c931b3 8091edbf

core/java/android/app/LoadedApk.java

+3 −1
Original line number Diff line number Diff line
@@ -360,7 +360,6 @@ public final class LoadedApk { 


                mClassLoader = ApplicationLoaders.getDefault().getClassLoader(zip, lib,

                        mBaseClassLoader);

                initializeJavaContextClassLoader();



                StrictMode.setThreadPolicy(oldPolicy);

            } else {
@@ -552,6 +551,9 @@ public final class LoadedApk { 


        try {

            java.lang.ClassLoader cl = getClassLoader();

            if (!mPackageName.equals("android")) {

                initializeJavaContextClassLoader();

            }

            ContextImpl appContext = ContextImpl.createAppContext(mActivityThread, this);

            app = mActivityThread.mInstrumentation.newApplication(

                    cl, appClass, appContext);