diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2020-11-26 23:14:13 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2020-11-26 23:14:13 +0000 |
| commit | bf598cdfbced87a281827e01e7b8dd0a07c99a01 (patch) | |
| tree | 03e29308868f993b9fda72ddd3d37ac26a633ed3 /core/java | |
| parent | 915c8155799e7881821dac39a3e43489f1f8443e (diff) | |
| parent | 4e4e82225ac09edc418c914a47b89c47650ff607 (diff) | |
Merge "SharedLibraryInfo.isNative() returns true for native libs"
Diffstat (limited to 'core/java')
| -rw-r--r-- | core/java/android/content/pm/SharedLibraryInfo.java | 9 | ||||
| -rw-r--r-- | core/java/com/android/internal/os/ZygoteInit.java | 9 |
2 files changed, 6 insertions, 12 deletions
diff --git a/core/java/android/content/pm/SharedLibraryInfo.java b/core/java/android/content/pm/SharedLibraryInfo.java index 862563706da7..a60e6428418d 100644 --- a/core/java/android/content/pm/SharedLibraryInfo.java +++ b/core/java/android/content/pm/SharedLibraryInfo.java @@ -114,15 +114,6 @@ public final class SharedLibraryInfo implements Parcelable { mIsNative = isNative; } - /** @hide */ - public SharedLibraryInfo(String path, String packageName, List<String> codePaths, - String name, long version, int type, - VersionedPackage declaringPackage, List<VersionedPackage> dependentPackages, - List<SharedLibraryInfo> dependencies) { - this(path, packageName, codePaths, name, version, type, declaringPackage, dependentPackages, - dependencies, false /* isNative */); - } - private SharedLibraryInfo(Parcel parcel) { mPath = parcel.readString8(); mPackageName = parcel.readString8(); diff --git a/core/java/com/android/internal/os/ZygoteInit.java b/core/java/com/android/internal/os/ZygoteInit.java index 9b5d295fa7a5..94e21e5a5965 100644 --- a/core/java/com/android/internal/os/ZygoteInit.java +++ b/core/java/com/android/internal/os/ZygoteInit.java @@ -391,16 +391,19 @@ public class ZygoteInit { SharedLibraryInfo hidlBase = new SharedLibraryInfo( "/system/framework/android.hidl.base-V1.0-java.jar", null /*packageName*/, null /*codePaths*/, null /*name*/, 0 /*version*/, SharedLibraryInfo.TYPE_BUILTIN, - null /*declaringPackage*/, null /*dependentPackages*/, null /*dependencies*/); + null /*declaringPackage*/, null /*dependentPackages*/, null /*dependencies*/, + false /*isNative*/); SharedLibraryInfo hidlManager = new SharedLibraryInfo( "/system/framework/android.hidl.manager-V1.0-java.jar", null /*packageName*/, null /*codePaths*/, null /*name*/, 0 /*version*/, SharedLibraryInfo.TYPE_BUILTIN, - null /*declaringPackage*/, null /*dependentPackages*/, null /*dependencies*/); + null /*declaringPackage*/, null /*dependentPackages*/, null /*dependencies*/, + false /*isNative*/); SharedLibraryInfo androidTestBase = new SharedLibraryInfo( "/system/framework/android.test.base.jar", null /*packageName*/, null /*codePaths*/, null /*name*/, 0 /*version*/, SharedLibraryInfo.TYPE_BUILTIN, - null /*declaringPackage*/, null /*dependentPackages*/, null /*dependencies*/); + null /*declaringPackage*/, null /*dependentPackages*/, null /*dependencies*/, + false /*isNative*/); ApplicationLoaders.getDefault().createAndCacheNonBootclasspathSystemClassLoaders( new SharedLibraryInfo[]{ |