Merge "Parcel compRequired flag correctly."

Jean-Baptiste Queru · android code review · commit d8ccd712dac9 · 2012-06-15T10:02:58.000-07:00
diff --git a/telephony/java/com/android/internal/telephony/cat/CommandDetails.java b/telephony/java/com/android/internal/telephony/cat/CommandDetails.java
@@ -48,13 +48,14 @@ public boolean compareTo(CommandDetails other) {
     }
 
     public CommandDetails(Parcel in) {
-        compRequired = true;
+        compRequired = in.readInt() != 0;
         commandNumber = in.readInt();
         typeOfCommand = in.readInt();
         commandQualifier = in.readInt();
     }
 
     public void writeToParcel(Parcel dest, int flags) {
+        dest.writeInt(compRequired ? 1 : 0);
         dest.writeInt(commandNumber);
         dest.writeInt(typeOfCommand);
         dest.writeInt(commandQualifier);
@@ -103,4 +104,4 @@ class ItemsIconId extends ValueObject {
     ComprehensionTlvTag getTag() {
         return ComprehensionTlvTag.ITEM_ICON_ID_LIST;
     }
-}
+}

Original file line number	Diff line number	Diff line change
`@@ -48,13 +48,14 @@ public boolean compareTo(CommandDetails other) {`
`48`	`48`	`}`
`49`	`49`
`50`	`50`	`public CommandDetails(Parcel in) {`
`51`		`- compRequired = true;`
	`51`	`+ compRequired = in.readInt() != 0;`
`52`	`52`	`commandNumber = in.readInt();`
`53`	`53`	`typeOfCommand = in.readInt();`
`54`	`54`	`commandQualifier = in.readInt();`
`55`	`55`	`}`
`56`	`56`
`57`	`57`	`public void writeToParcel(Parcel dest, int flags) {`
	`58`	`+ dest.writeInt(compRequired ? 1 : 0);`
`58`	`59`	`dest.writeInt(commandNumber);`
`59`	`60`	`dest.writeInt(typeOfCommand);`
`60`	`61`	`dest.writeInt(commandQualifier);`
`@@ -103,4 +104,4 @@ class ItemsIconId extends ValueObject {`
`103`	`104`	`ComprehensionTlvTag getTag() {`
`104`	`105`	`return ComprehensionTlvTag.ITEM_ICON_ID_LIST;`
`105`	`106`	`}`
`106`		`-}`
	`107`	`+}`