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

Commit 9ebeee82 authored by Svetoslav Ganov's avatar Svetoslav Ganov Committed by android-build-merger
Browse files

Merge "Multi packages per APK" into nyc-dev 

am: f2971c45

* commit 'f2971c45':
  Multi packages per APK
parents c1a79aeb f2971c45

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);