summaryrefslogtreecommitdiffstats
path: root/telecomm/java/android/telecom/ParcelableConnection.java
diff options
context:
space:
mode:
authorDanny Baumann <dannybaumann@web.de>2014-11-13 14:28:53 +0100
committerGerrit Code Review <gerrit@cyanogenmod.org>2015-12-15 04:43:19 -0800
commit9427c1ab15ce6a4c74dabbc63c52c28825a53128 (patch)
treed1421d2d46d89f66964704f97ba3b5e56edc4781 /telecomm/java/android/telecom/ParcelableConnection.java
parent39f4239dd85cf0dc8bc222b9656c098fb3b131d9 (diff)
downloadframeworks_base-9427c1ab15ce6a4c74dabbc63c52c28825a53128.zip
frameworks_base-9427c1ab15ce6a4c74dabbc63c52c28825a53128.tar.gz
frameworks_base-9427c1ab15ce6a4c74dabbc63c52c28825a53128.tar.bz2
Proper supplementary service notification handling (1/5).
Change-Id: I4fa94d4ba68a1570d3f822be569ae124882c0e66
Diffstat (limited to 'telecomm/java/android/telecom/ParcelableConnection.java')
-rw-r--r--telecomm/java/android/telecom/ParcelableConnection.java12
1 files changed, 12 insertions, 0 deletions
diff --git a/telecomm/java/android/telecom/ParcelableConnection.java b/telecomm/java/android/telecom/ParcelableConnection.java
index fe0a4d8..eca06af 100644
--- a/telecomm/java/android/telecom/ParcelableConnection.java
+++ b/telecomm/java/android/telecom/ParcelableConnection.java
@@ -36,6 +36,7 @@ public final class ParcelableConnection implements Parcelable {
private final PhoneAccountHandle mPhoneAccount;
private final int mState;
private final int mConnectionCapabilities;
+ private final int mConnectionProperties;
private final Uri mAddress;
private final int mAddressPresentation;
private final String mCallerDisplayName;
@@ -55,6 +56,7 @@ public final class ParcelableConnection implements Parcelable {
PhoneAccountHandle phoneAccount,
int state,
int capabilities,
+ int properties,
Uri address,
int addressPresentation,
String callerDisplayName,
@@ -71,6 +73,7 @@ public final class ParcelableConnection implements Parcelable {
mPhoneAccount = phoneAccount;
mState = state;
mConnectionCapabilities = capabilities;
+ mConnectionProperties = properties;
mAddress = address;
mAddressPresentation = addressPresentation;
mCallerDisplayName = callerDisplayName;
@@ -99,6 +102,10 @@ public final class ParcelableConnection implements Parcelable {
return mConnectionCapabilities;
}
+ public int getConnectionProperties() {
+ return mConnectionProperties;
+ }
+
public Uri getHandle() {
return mAddress;
}
@@ -160,6 +167,8 @@ public final class ParcelableConnection implements Parcelable {
.append(mState)
.append(", capabilities:")
.append(Connection.capabilitiesToString(mConnectionCapabilities))
+ .append(", properties:")
+ .append(Connection.propertiesToString(mConnectionProperties))
.append(", extras:")
.append(mExtras)
.toString();
@@ -174,6 +183,7 @@ public final class ParcelableConnection implements Parcelable {
PhoneAccountHandle phoneAccount = source.readParcelable(classLoader);
int state = source.readInt();
int capabilities = source.readInt();
+ int properties = source.readInt();
Uri address = source.readParcelable(classLoader);
int addressPresentation = source.readInt();
String callerDisplayName = source.readString();
@@ -194,6 +204,7 @@ public final class ParcelableConnection implements Parcelable {
phoneAccount,
state,
capabilities,
+ properties,
address,
addressPresentation,
callerDisplayName,
@@ -227,6 +238,7 @@ public final class ParcelableConnection implements Parcelable {
destination.writeParcelable(mPhoneAccount, 0);
destination.writeInt(mState);
destination.writeInt(mConnectionCapabilities);
+ destination.writeInt(mConnectionProperties);
destination.writeParcelable(mAddress, 0);
destination.writeInt(mAddressPresentation);
destination.writeString(mCallerDisplayName);