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

Merge "Create linker namespace in startServiceFromJar"

Browse Source
This commit is contained in:
Treehugger Robot
2020-12-04 07:34:41 +00:00
committed by Gerrit Code Review
parent 3af010fe57 8e74eb6b43
commit e59313abcc
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
services/core/java/com/android/server/SystemServiceManager.java
View File

@@ -20,6 +20,7 @@ import android.annotation.NonNull;
import android.annotation.UserIdInt; import android.annotation.UserIdInt;
import android.content.Context; import android.content.Context;
import android.content.pm.UserInfo; import android.content.pm.UserInfo;
import android.os.Build;
import android.os.Environment; import android.os.Environment;
import android.os.SystemClock; import android.os.SystemClock;
import android.os.Trace; import android.os.Trace;
@@ -28,6 +29,7 @@ import android.os.UserManagerInternal;
import android.util.ArrayMap; import android.util.ArrayMap;
import android.util.Slog; import android.util.Slog;
import com.android.internal.os.ClassLoaderFactory;
import com.android.server.SystemService.TargetUser; import com.android.server.SystemService.TargetUser;
import com.android.server.utils.TimingsTraceAndSlog; import com.android.server.utils.TimingsTraceAndSlog;
@@ -99,7 +101,10 @@ public class SystemServiceManager {
if (pathClassLoader == null) { if (pathClassLoader == null) {
// NB: the parent class loader should always be the system server class loader. // NB: the parent class loader should always be the system server class loader.
// Changing it has implications that require discussion with the mainline team. // Changing it has implications that require discussion with the mainline team.
pathClassLoader = new PathClassLoader(path, this.getClass().getClassLoader()); pathClassLoader = (PathClassLoader) ClassLoaderFactory.createClassLoader(
path, null /* librarySearchPath */, null /* libraryPermittedPath */,
this.getClass().getClassLoader(), Build.VERSION.SDK_INT,
true /* isNamespaceShared */, null /* classLoaderName */);
mLoadedPaths.put(path, pathClassLoader); mLoadedPaths.put(path, pathClassLoader);
} }
final Class<SystemService> serviceClass = loadClassFromLoader(className, pathClassLoader); final Class<SystemService> serviceClass = loadClassFromLoader(className, pathClassLoader);