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 am: bf53e16efd

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14260709

Change-Id: Id424e33da4973f85348374a8c3c31d87beada40c
This commit is contained in:
Rhed Jao
2021-04-27 06:15:21 +00:00
committed by Automerger Merge Worker
parent f01d6f2e03 bf53e16efd
commit 83e849ce64
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);
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()
.instantiateService(cl, data.info.name, data.intent);
final ContextImpl context = ContextImpl.getImpl(service
ContextImpl context = ContextImpl.getImpl(service
.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
// context.
context.getResources().addLoaders(