Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Brian Carlstrom
2014-10-16 01:01:25 +00:00
committed by Android (Google) Code Review
parent 36c931b31a 8091edbffb
commit 20de619d66
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/java/android/app/LoadedApk.java
View File

@@ -360,7 +360,6 @@ public final class LoadedApk {
mClassLoader = ApplicationLoaders.getDefault().getClassLoader(zip, lib, mClassLoader = ApplicationLoaders.getDefault().getClassLoader(zip, lib,
mBaseClassLoader); mBaseClassLoader);
initializeJavaContextClassLoader();
StrictMode.setThreadPolicy(oldPolicy); StrictMode.setThreadPolicy(oldPolicy);
} else { } else {
@@ -552,6 +551,9 @@ public final class LoadedApk {
try { try {
java.lang.ClassLoader cl = getClassLoader(); java.lang.ClassLoader cl = getClassLoader();
if (!mPackageName.equals("android")) {
initializeJavaContextClassLoader();
}
ContextImpl appContext = ContextImpl.createAppContext(mActivityThread, this); ContextImpl appContext = ContextImpl.createAppContext(mActivityThread, this);
app = mActivityThread.mInstrumentation.newApplication( app = mActivityThread.mInstrumentation.newApplication(
cl, appClass, appContext); cl, appClass, appContext);