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

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

Browse Source 
* commit 'fc1e84777c957bb094f793f8d286e873d070e7e0':
  Use CharSequence for DisplayName
This commit is contained in:
Stuart Scott
2014-11-05 04:05:41 +00:00
committed by Android Git Automerger
parent 9be76b0e40 fc1e84777c
commit 1e5275da2f
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(); int id = source.readInt();
String iccId = source.readString(); String iccId = source.readString();
int simSlotIndex = source.readInt(); int simSlotIndex = source.readInt();
String displayName = source.readString(); CharSequence displayName = source.readCharSequence();
int nameSource = source.readInt(); int nameSource = source.readInt();
int color = source.readInt(); int color = source.readInt();
String number = source.readString(); String number = source.readString();
@@ -247,7 +247,7 @@ public class SubInfoRecord implements Parcelable {
dest.writeInt(mId); dest.writeInt(mId);
dest.writeString(mIccId); dest.writeString(mIccId);
dest.writeInt(mSimSlotIndex); dest.writeInt(mSimSlotIndex);
dest.writeString(mDisplayName.toString()); dest.writeCharSequence(mDisplayName);
dest.writeInt(mNameSource); dest.writeInt(mNameSource);
dest.writeInt(mColor); dest.writeInt(mColor);
dest.writeString(mNumber.toString()); dest.writeString(mNumber.toString());