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

Commit 9ea23edb authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "Revert "Optimize string interning in ParsedComponentImpl serialization"" into main

parents 9df1b290 e0aead93

core/java/com/android/internal/pm/pkg/component/ParsedComponentImpl.java

+2 −2
Original line number Diff line number Diff line
@@ -157,7 +157,7 @@ public abstract class ParsedComponentImpl implements ParsedComponent, Parcelable 


    @Override

    public void writeToParcel(Parcel dest, int flags) {

        sForInternedString.parcel(this.name, dest, flags);

        dest.writeString(this.name);

        dest.writeInt(this.getIcon());

        dest.writeInt(this.getLabelRes());

        dest.writeCharSequence(this.getNonLocalizedLabel());
@@ -175,7 +175,7 @@ public abstract class ParsedComponentImpl implements ParsedComponent, Parcelable 
        // We use the boot classloader for all classes that we load.

        final ClassLoader boot = Object.class.getClassLoader();

        //noinspection ConstantConditions

        this.name = sForInternedString.unparcel(in);

        this.name = in.readString();

        this.icon = in.readInt();

        this.labelRes = in.readInt();

        this.nonLocalizedLabel = in.readCharSequence();