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

Commit f2971c45 authored by Svetoslav Ganov's avatar Svetoslav Ganov Committed by Android (Google) Code Review
Browse files

Merge "Multi packages per APK" into nyc-dev

parents f4aa7d2e 354cd3ce

core/java/android/content/pm/ApplicationInfo.java

+1 −1
Original line number Diff line number Diff line
@@ -181,7 +181,7 @@ public class ApplicationInfo extends PackageItemInfo implements Parcelable { 
    public static final int FLAG_UPDATED_SYSTEM_APP = 1<<7;

    

    /**

     * Value for {@link #flags}: this is set of the application has specified

     * Value for {@link #flags}: this is set if the application has specified

     * {@link android.R.styleable#AndroidManifestApplication_testOnly

     * android:testOnly} to be true.

     */

core/java/android/content/pm/PackageManager.java

+1 −1
Original line number Diff line number Diff line
@@ -4489,7 +4489,7 @@ public abstract class PackageManager { 


            PackageParser.Package pkg = parser.parseMonolithicPackage(apkFile, 0);

            if ((flags & GET_SIGNATURES) != 0) {

                parser.collectCertificates(pkg, 0);

                PackageParser.collectCertificates(pkg, 0);

            }

            PackageUserState state = new PackageUserState();

            return PackageParser.generatePackageInfo(pkg, null, flags, 0, 0, null, state);

core/java/android/content/pm/PackageParser.java

+484 −164

File changed.

Preview size limit exceeded, changes collapsed.

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

+872 −351

File changed.

Preview size limit exceeded, changes collapsed.

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

+4 −2
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ import android.content.pm.PackageManager; 
import android.content.pm.PackageParser;



import java.io.File;

import java.util.List;



/**

 * Settings data for a particular package we know about.
@@ -33,10 +34,11 @@ final class PackageSetting extends PackageSettingBase { 
    PackageSetting(String name, String realName, File codePath, File resourcePath,

            String legacyNativeLibraryPathString, String primaryCpuAbiString,

            String secondaryCpuAbiString, String cpuAbiOverrideString,

            int pVersionCode, int pkgFlags, int privateFlags) {

            int pVersionCode, int pkgFlags, int privateFlags, String parentPackageName,

            List<String> childPackageNames) {

        super(name, realName, codePath, resourcePath, legacyNativeLibraryPathString,

                primaryCpuAbiString, secondaryCpuAbiString, cpuAbiOverrideString,

                pVersionCode, pkgFlags, privateFlags);

                pVersionCode, pkgFlags, privateFlags, parentPackageName, childPackageNames);

    }



    /**