diff options
author | Ihab Awad <ihab@google.com> | 2014-11-12 13:41:16 -0800 |
---|---|---|
committer | Ihab Awad <ihab@google.com> | 2014-11-28 15:54:35 -0800 |
commit | 5c9c86ec0f95d1f5e1aca212967f508fc736b895 (patch) | |
tree | 1706be6ac513145c4d0eab52649319509bd99d1e /telecomm/java/android/telecom/ParcelableConference.java | |
parent | 07b4a291319ec48a272451789ab0fbbf8d55a050 (diff) | |
download | frameworks_base-5c9c86ec0f95d1f5e1aca212967f508fc736b895.zip frameworks_base-5c9c86ec0f95d1f5e1aca212967f508fc736b895.tar.gz frameworks_base-5c9c86ec0f95d1f5e1aca212967f508fc736b895.tar.bz2 |
Telecom API updates (1/6)
Bug: 18292176
Change-Id: I060366234a5a60510c385dc837f2b7e79596eaf5
Diffstat (limited to 'telecomm/java/android/telecom/ParcelableConference.java')
-rw-r--r-- | telecomm/java/android/telecom/ParcelableConference.java | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/telecomm/java/android/telecom/ParcelableConference.java b/telecomm/java/android/telecom/ParcelableConference.java index 97c709c..c4e11d6 100644 --- a/telecomm/java/android/telecom/ParcelableConference.java +++ b/telecomm/java/android/telecom/ParcelableConference.java @@ -30,17 +30,17 @@ public final class ParcelableConference implements Parcelable { private PhoneAccountHandle mPhoneAccount; private int mState; - private int mCapabilities; + private int mConnectionCapabilities; private List<String> mConnectionIds; public ParcelableConference( PhoneAccountHandle phoneAccount, int state, - int capabilities, + int connectionCapabilities, List<String> connectionIds) { mPhoneAccount = phoneAccount; mState = state; - mCapabilities = capabilities; + mConnectionCapabilities = connectionCapabilities; mConnectionIds = connectionIds; } @@ -52,7 +52,7 @@ public final class ParcelableConference implements Parcelable { .append(", state: ") .append(Connection.stateToString(mState)) .append(", capabilities: ") - .append(PhoneCapabilities.toString(mCapabilities)) + .append(Connection.capabilitiesToString(mConnectionCapabilities)) .append(", children: ") .append(mConnectionIds) .toString(); @@ -66,8 +66,8 @@ public final class ParcelableConference implements Parcelable { return mState; } - public int getCapabilities() { - return mCapabilities; + public int getConnectionCapabilities() { + return mConnectionCapabilities; } public List<String> getConnectionIds() { @@ -105,7 +105,7 @@ public final class ParcelableConference implements Parcelable { public void writeToParcel(Parcel destination, int flags) { destination.writeParcelable(mPhoneAccount, 0); destination.writeInt(mState); - destination.writeInt(mCapabilities); + destination.writeInt(mConnectionCapabilities); destination.writeList(mConnectionIds); } } |