diff options
| -rw-r--r-- | services/core/java/com/android/server/SystemServiceManager.java | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/services/core/java/com/android/server/SystemServiceManager.java b/services/core/java/com/android/server/SystemServiceManager.java index 74bb7d7e90f1..9205737a550a 100644 --- a/services/core/java/com/android/server/SystemServiceManager.java +++ b/services/core/java/com/android/server/SystemServiceManager.java @@ -20,6 +20,7 @@ import android.annotation.NonNull; import android.annotation.UserIdInt; import android.content.Context; import android.content.pm.UserInfo; +import android.os.Build; import android.os.Environment; import android.os.SystemClock; import android.os.Trace; @@ -28,6 +29,7 @@ import android.os.UserManagerInternal; import android.util.ArrayMap; import android.util.Slog; +import com.android.internal.os.ClassLoaderFactory; import com.android.server.SystemService.TargetUser; import com.android.server.utils.TimingsTraceAndSlog; @@ -99,7 +101,10 @@ public class SystemServiceManager { if (pathClassLoader == null) { // NB: the parent class loader should always be the system server class loader. // 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); } final Class<SystemService> serviceClass = loadClassFromLoader(className, pathClassLoader); |