Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 8585e0dd: Merge "Use CharSequence for DisplayName" into lmp-mr1-dev

Browse Source 
* commit '8585e0dd4c7cf7b883de9cd40dc81099abe246c4':
  Use CharSequence for DisplayName
This commit is contained in:
Stuart Scott
2014-11-05 02:18:35 +00:00
committed by Android Git Automerger
parent ed24700385 8585e0dd4c
commit fc1e84777c
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
telephony/java/android/telephony/SubInfoRecord.java
View File

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