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

Commit e0aead93 authored by Ivan Chiang's avatar Ivan Chiang Committed by Gerrit Code Review
Browse files

Revert "Optimize string interning in ParsedComponentImpl serialization" 

This reverts commit 4f0c6a5d.

Reason for revert: The patch causes the boot time to increase a lot. b/397854605

Change-Id: I81cd203c66505ad22306591863a15b7e02d76d83
parent 4f0c6a5d

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

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




    @Override

    @Override

    public void writeToParcel(Parcel dest, int flags) {

    public void writeToParcel(Parcel dest, int flags) {

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

        dest.writeString(this.name);

        dest.writeInt(this.getIcon());

        dest.writeInt(this.getIcon());

        dest.writeInt(this.getLabelRes());

        dest.writeInt(this.getLabelRes());

        dest.writeCharSequence(this.getNonLocalizedLabel());

        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.

        // We use the boot classloader for all classes that we load.

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

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

        //noinspection ConstantConditions

        //noinspection ConstantConditions

        this.name = sForInternedString.unparcel(in);

        this.name = in.readString();

        this.icon = in.readInt();

        this.icon = in.readInt();

        this.labelRes = in.readInt();

        this.labelRes = in.readInt();

        this.nonLocalizedLabel = in.readCharSequence();

        this.nonLocalizedLabel = in.readCharSequence();