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

Merge "Fix a crash when starting a service in the isolated split" into sc-dev

Browse Source
This commit is contained in:
Rhed Jao
2021-04-27 06:06:16 +00:00
committed by Android (Google) Code Review
parent 56491b4c1e e6bcbdcafa
commit bf53e16efd
1 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
core/java/android/app/ActivityThread.java
View File

@@ -4416,11 +4416,20 @@ public final class ActivityThread extends ClientTransactionHandler
if (localLOGV) Slog.v(TAG, "Creating service " + data.info.name); if (localLOGV) Slog.v(TAG, "Creating service " + data.info.name);
Application app = packageInfo.makeApplication(false, mInstrumentation); Application app = packageInfo.makeApplication(false, mInstrumentation);
java.lang.ClassLoader cl = packageInfo.getClassLoader();
final java.lang.ClassLoader cl;
if (data.info.splitName != null) {
cl = packageInfo.getSplitClassLoader(data.info.splitName);
} else {
cl = packageInfo.getClassLoader();
}
service = packageInfo.getAppFactory() service = packageInfo.getAppFactory()
.instantiateService(cl, data.info.name, data.intent); .instantiateService(cl, data.info.name, data.intent);
final ContextImpl context = ContextImpl.getImpl(service ContextImpl context = ContextImpl.getImpl(service
.createServiceBaseContext(this, packageInfo)); .createServiceBaseContext(this, packageInfo));
if (data.info.splitName != null) {
context = (ContextImpl) context.createContextForSplit(data.info.splitName);
}
// Service resources must be initialized with the same loaders as the application // Service resources must be initialized with the same loaders as the application
// context. // context.
context.getResources().addLoaders( context.getResources().addLoaders(