Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Telecom API updates (1/6)

Browse Source 
Bug: 18292176

Change-Id: I060366234a5a60510c385dc837f2b7e79596eaf5
This commit is contained in:
Ihab Awad
2014-11-12 13:41:16 -08:00
parent 07b4a29131
commit 5c9c86ec0f
15 changed files with 644 additions and 331 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
telecomm/java/android/telecom/ParcelableConnection.java
View File

@@ -34,7 +34,7 @@ import java.util.List;
public final class ParcelableConnection implements Parcelable {
private final PhoneAccountHandle mPhoneAccount;
private final int mState;
private final int mCapabilities;
private final int mConnectionCapabilities;
private final Uri mAddress;
private final int mAddressPresentation;
private final String mCallerDisplayName;
@@ -65,7 +65,7 @@ public final class ParcelableConnection implements Parcelable {
List<String> conferenceableConnectionIds) {
mPhoneAccount = phoneAccount;
mState = state;
mCapabilities = capabilities;
mConnectionCapabilities = capabilities;
mAddress = address;
mAddressPresentation = addressPresentation;
mCallerDisplayName = callerDisplayName;
@@ -88,8 +88,8 @@ public final class ParcelableConnection implements Parcelable {
}
// Bit mask of actions a call supports, values are defined in {@link CallCapabilities}.
public int getCapabilities() {
return mCapabilities;
public int getConnectionCapabilities() {
return mConnectionCapabilities;
}
public Uri getHandle() {
@@ -144,7 +144,7 @@ public final class ParcelableConnection implements Parcelable {
.append(", state:")
.append(mState)
.append(", capabilities:")
.append(PhoneCapabilities.toString(mCapabilities))
.append(Connection.capabilitiesToString(mConnectionCapabilities))
.toString();
}
@@ -205,7 +205,7 @@ public final class ParcelableConnection implements Parcelable {
public void writeToParcel(Parcel destination, int flags) {
destination.writeParcelable(mPhoneAccount, 0);
destination.writeInt(mState);
destination.writeInt(mCapabilities);
destination.writeInt(mConnectionCapabilities);
destination.writeParcelable(mAddress, 0);
destination.writeInt(mAddressPresentation);
destination.writeString(mCallerDisplayName);