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

Commit 131084c9 authored by Patrick Baumann's avatar Patrick Baumann Committed by Automerger Merge Worker
Browse files

Merge "Parcel queriesProviders in ParsingPackageImpl" am: 8ee2b99d 

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1584517

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I95f95fdfbc3cf9b4f97b8d17f2c4c6883bad0e44
parents a5d4ead8 8ee2b99d

core/java/android/content/pm/parsing/ParsingPackageImpl.java

+4 −0
Original line number Diff line number Diff line
@@ -98,6 +98,8 @@ public class ParsingPackageImpl implements ParsingPackage, Parcelable { 
    public static ForInternedStringValueMap sForInternedStringValueMap =

            Parcelling.Cache.getOrCreate(ForInternedStringValueMap.class);

    public static ForStringSet sForStringSet = Parcelling.Cache.getOrCreate(ForStringSet.class);

    public static ForInternedStringSet sForInternedStringSet =

            Parcelling.Cache.getOrCreate(ForInternedStringSet.class);

    protected static ParsedIntentInfo.StringPairListParceler sForIntentInfoPairs =

            Parcelling.Cache.getOrCreate(ParsedIntentInfo.StringPairListParceler.class);
@@ -1033,6 +1035,7 @@ public class ParsingPackageImpl implements ParsingPackage, Parcelable { 
        dest.writeBoolean(this.forceQueryable);

        dest.writeParcelableList(this.queriesIntents, flags);

        sForInternedStringList.parcel(this.queriesPackages, dest, flags);

        sForInternedStringSet.parcel(this.queriesProviders, dest, flags);

        dest.writeString(this.appComponentFactory);

        dest.writeString(this.backupAgentName);

        dest.writeInt(this.banner);
@@ -1197,6 +1200,7 @@ public class ParsingPackageImpl implements ParsingPackage, Parcelable { 
        this.forceQueryable = in.readBoolean();

        this.queriesIntents = in.createTypedArrayList(Intent.CREATOR);

        this.queriesPackages = sForInternedStringList.unparcel(in);

        this.queriesProviders = sForInternedStringSet.unparcel(in);

        this.appComponentFactory = in.readString();

        this.backupAgentName = in.readString();

        this.banner = in.readInt();