summaryrefslogtreecommitdiffstats
path: root/telephony
diff options
context:
space:
mode:
authorJean-Baptiste Queru <jbq@google.com>2012-06-15 10:02:57 -0700
committerandroid code review <noreply-gerritcodereview@google.com>2012-06-15 10:02:58 -0700
commitd8ccd712dac9e8f4e8068b02f5ca55b014de831a (patch)
treef926229de898fb0ccbb0415d7a8fae36df8318ab /telephony
parent0f160c95122276c40ca84afe6fcd2b9cd800e35c (diff)
parent73f5618ab45a5361baa23656d4b2b06d8b2a8d46 (diff)
downloadframeworks_base-d8ccd712dac9e8f4e8068b02f5ca55b014de831a.zip
frameworks_base-d8ccd712dac9e8f4e8068b02f5ca55b014de831a.tar.gz
frameworks_base-d8ccd712dac9e8f4e8068b02f5ca55b014de831a.tar.bz2
Merge "Parcel compRequired flag correctly."
Diffstat (limited to 'telephony')
-rw-r--r--telephony/java/com/android/internal/telephony/cat/CommandDetails.java5
1 files changed, 3 insertions, 2 deletions
diff --git a/telephony/java/com/android/internal/telephony/cat/CommandDetails.java b/telephony/java/com/android/internal/telephony/cat/CommandDetails.java
index e3f0798..bb875be 100644
--- a/telephony/java/com/android/internal/telephony/cat/CommandDetails.java
+++ b/telephony/java/com/android/internal/telephony/cat/CommandDetails.java
@@ -48,13 +48,14 @@ class CommandDetails extends ValueObject implements Parcelable {
}
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;
}
-} \ No newline at end of file
+}