Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit bf598cdf authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "SharedLibraryInfo.isNative() returns true for native libs"

parents 915c8155 4e4e8222

core/java/android/content/pm/SharedLibraryInfo.java

+0 −9
Original line number Diff line number Diff line
@@ -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();

core/java/com/android/internal/os/ZygoteInit.java

+6 −3
Original line number Diff line number Diff line
@@ -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[]{

core/tests/coretests/src/android/app/ApplicationLoadersTest.java

+1 −1
Original line number Diff line number Diff line
@@ -42,7 +42,7 @@ public class ApplicationLoadersTest { 
        return new SharedLibraryInfo(

                zip, null /*packageName*/, null /*codePaths*/, null /*name*/, 0 /*version*/,

                SharedLibraryInfo.TYPE_BUILTIN, null /*declaringPackage*/,

                null /*dependentPackages*/, null /*dependencies*/);

                null /*dependentPackages*/, null /*dependencies*/, false /*isNative*/);

    }



    @Test

services/core/java/com/android/server/pm/PackageManagerService.java

+4 −2
Original line number Diff line number Diff line
@@ -5717,7 +5717,8 @@ public class PackageManagerService extends IPackageManager.Stub 
                            getPackagesUsingSharedLibraryLPr(libInfo, flags, userId),

                            (libInfo.getDependencies() == null

                                    ? null

                                    : new ArrayList<>(libInfo.getDependencies())));

                                    : new ArrayList<>(libInfo.getDependencies())),

                            libInfo.isNative());















                    if (result == null) {















                        result = new ArrayList<>();










@@ -5786,7 +5787,8 @@ public class PackageManagerService extends IPackageManager.Stub













                            libraryInfo.getLongVersion(), libraryInfo.getType(),















                            libraryInfo.getDeclaringPackage(), getPackagesUsingSharedLibraryLPr(















                            libraryInfo, flags, userId), libraryInfo.getDependencies() == null













                            ? null : new ArrayList<>(libraryInfo.getDependencies()));













                            ? null : new ArrayList<>(libraryInfo.getDependencies()),













                            libraryInfo.isNative());





























                    if (result == null) {















                        result = new ArrayList<>();

























services/core/java/com/android/server/pm/parsing/pkg/AndroidPackageUtils.java



+2
−2






























Original line number
Diff line number
Diff line








@@ -94,7 +94,7 @@ public class AndroidPackageUtils {













                SharedLibraryInfo.TYPE_STATIC,















                new VersionedPackage(pkg.getManifestPackageName(),















                        pkg.getLongVersionCode()),













                null, null);













                null, null, false /* isNative */);















    }































    public static SharedLibraryInfo createSharedLibraryForDynamic(AndroidPackage pkg, String name) {









@@ -103,7 +103,7 @@ public class AndroidPackageUtils {













                SharedLibraryInfo.VERSION_UNDEFINED,















                SharedLibraryInfo.TYPE_DYNAMIC, new VersionedPackage(pkg.getPackageName(),















                pkg.getLongVersionCode()),













                null, null);













                null, null, false /* isNative */);















    }































    /**