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

Commit 8585e0dd authored by Stuart Scott's avatar Stuart Scott Committed by Android (Google) Code Review
Browse files

Merge "Use CharSequence for DisplayName" into lmp-mr1-dev

parents c56a1f17 8b564c2a

telephony/java/android/telephony/SubInfoRecord.java

+2 −2
Original line number Diff line number Diff line
@@ -222,7 +222,7 @@ public class SubInfoRecord implements Parcelable { 
            int id = source.readInt();

            String iccId = source.readString();

            int simSlotIndex = source.readInt();

            String displayName = source.readString();

            CharSequence displayName = source.readCharSequence();

            int nameSource = source.readInt();

            int color = source.readInt();

            String number = source.readString();
@@ -247,7 +247,7 @@ public class SubInfoRecord implements Parcelable { 
        dest.writeInt(mId);

        dest.writeString(mIccId);

        dest.writeInt(mSimSlotIndex);

        dest.writeString(mDisplayName.toString());

        dest.writeCharSequence(mDisplayName);

        dest.writeInt(mNameSource);

        dest.writeInt(mColor);

        dest.writeString(mNumber.toString());