Skip to content
Snippets Groups Projects
Commit cebf5c06 authored by Android Build Coastguard Worker's avatar Android Build Coastguard Worker
Browse files

Merge cherrypicks of [15665254, 15639253, 15667784, 15667785] into sc-release

Change-Id: I72175e5b94e14894e2cfc898720f439c277e4be8
parents 550ec2c8 ec46a0c9
No related branches found
No related tags found
No related merge requests found
......@@ -30,6 +30,7 @@ public class OptionsSipResponse implements Parcelable {
private int mSipResponseCode = 0;
private int mRetryAfter = 0;
private String mReasonPhrase = "";
private String mReasonHeader = "";
/**
* Gets the Options command ID.
......@@ -116,6 +117,22 @@ public class OptionsSipResponse implements Parcelable {
this.mRetryAfter = retryAfter;
}
/**
* Gets the reason header associated with the SIP response code.
* @hide
*/
public String getReasonHeader() {
return mReasonHeader;
}
/**
* Sets the SIP response code reason phrase.
* @hide
*/
public void setReasonHeader(String reasonHeader) {
this.mReasonHeader = reasonHeader;
}
/**
* Constructor for the OptionsSipResponse class.
* @hide
......@@ -138,6 +155,7 @@ public class OptionsSipResponse implements Parcelable {
dest.writeString(mReasonPhrase);
dest.writeParcelable(mCmdId, flags);
dest.writeInt(mRetryAfter);
dest.writeString(mReasonHeader);
}
/** @hide */
......@@ -164,5 +182,6 @@ public class OptionsSipResponse implements Parcelable {
mReasonPhrase = source.readString();
mCmdId = source.readParcelable(OptionsCmdId.class.getClassLoader());
mRetryAfter = source.readInt();
mReasonHeader = source.readString();
}
}
......@@ -29,6 +29,7 @@ public class PresSipResponse implements Parcelable {
private int mSipResponseCode = 0;
private int mRetryAfter = 0;
private String mReasonPhrase = "";
private String mReasonHeader = "";
/**
* Gets the Presence command ID.
......@@ -122,6 +123,23 @@ public class PresSipResponse implements Parcelable {
this.mRetryAfter = retryAfter;
}
/**
* Gets the reason header associated with the SIP response
* code.
* @hide
*/
public String getReasonHeader() {
return mReasonHeader;
}
/**
* Sets the SIP response code reason header.
* @hide
*/
public void setReasonHeader(String reasonHeader) {
this.mReasonHeader = reasonHeader;
}
/**
* Constructor for the PresSipResponse class.
* @hide
......@@ -141,6 +159,7 @@ public class PresSipResponse implements Parcelable {
dest.writeString(mReasonPhrase);
dest.writeParcelable(mCmdId, flags);
dest.writeInt(mRetryAfter);
dest.writeString(mReasonHeader);
}
/** @hide */
......@@ -168,5 +187,6 @@ public class PresSipResponse implements Parcelable {
mReasonPhrase = source.readString();
mCmdId = source.readParcelable(PresCmdId.class.getClassLoader());
mRetryAfter = source.readInt();
mReasonHeader = source.readString();
}
}
\ No newline at end of file
......@@ -27,6 +27,7 @@ public class PresTupleInfo implements Parcelable {
private String mFeatureTag = "";
private String mContactUri = "";
private String mTimestamp = "";
private String mVersion = "";
/**
......@@ -79,6 +80,22 @@ public class PresTupleInfo implements Parcelable {
this.mTimestamp = timestamp;
}
/**
* Gets the version.
* @hide
*/
public String getVersion() {
return mVersion;
}
/**
* Sets the version.
* @hide
*/
public void setVersion(String version) {
this.mVersion = version;
}
/**
* Constructor for the PresTupleInfo class.
* @hide
......@@ -96,6 +113,7 @@ public class PresTupleInfo implements Parcelable {
dest.writeString(mFeatureTag);
dest.writeString(mContactUri);
dest.writeString(mTimestamp);
dest.writeString(mVersion);
}
/** @hide */
......@@ -121,5 +139,6 @@ public class PresTupleInfo implements Parcelable {
mFeatureTag = source.readString();
mContactUri = source.readString();
mTimestamp = source.readString();
mVersion = source.readString();
}
}
\ No newline at end of file
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment