diff options
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); } } |