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

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

Merge "Optimize string interning in ParsedComponentImpl serialization" into main am: 84637eb3 

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



Change-Id: I50d42955dedef567abdbb79b24703f0cf5cbba32
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents ed2b88d8 84637eb3

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

        dest.writeString(this.name);

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

        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 = in.readString();

        this.name = sForInternedString.unparcel(in);

        this.icon = in.readInt();

        this.labelRes = in.readInt();

        this.nonLocalizedLabel = in.readCharSequence();