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

Commit 91ce932f authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Revert "Optimize string interning in ParsedComponentImpl... 

Merge "Revert "Optimize string interning in ParsedComponentImpl serialization"" into main am: 9ea23edb

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



Change-Id: Ie176840a550ff7a4bd77fae4650b8e3d634ada98
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 560afe0f 9ea23edb

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