drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 2dd63ccd: am d8ccd712: Merge "Parcel compRequired flag correctly."

Browse Source 
* commit '2dd63ccdb0e4109d03c51a002ff785c9d8a8ccb9':
  Parcel compRequired flag correctly.
This commit is contained in:
Jean-Baptiste Queru
2012-06-15 10:13:31 -07:00
committed by Android Git Automerger
parent f103e8bbe4 2dd63ccdb0
commit a310500f6c
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
telephony/java/com/android/internal/telephony/cat/CommandDetails.java
View File

@ -48,13 +48,14 @@ class CommandDetails extends ValueObject implements Parcelable {
} }
public CommandDetails(Parcel in) { public CommandDetails(Parcel in) {
compRequired = true; compRequired = in.readInt() != 0;
commandNumber = in.readInt(); commandNumber = in.readInt();
typeOfCommand = in.readInt(); typeOfCommand = in.readInt();
commandQualifier = in.readInt(); commandQualifier = in.readInt();
} }
public void writeToParcel(Parcel dest, int flags) { public void writeToParcel(Parcel dest, int flags) {
dest.writeInt(compRequired ? 1 : 0);
dest.writeInt(commandNumber); dest.writeInt(commandNumber);
dest.writeInt(typeOfCommand); dest.writeInt(typeOfCommand);
dest.writeInt(commandQualifier); dest.writeInt(commandQualifier);
@ -111,4 +112,4 @@ class ItemsIconId extends ValueObject {
ComprehensionTlvTag getTag() { ComprehensionTlvTag getTag() {
return ComprehensionTlvTag.ITEM_ICON_ID_LIST; return ComprehensionTlvTag.ITEM_ICON_ID_LIST;
} }
} }