| commit | e01728b713bfe06a1214192b90c29fecbfdb064e | [log] [tgz] |
|---|---|---|
| author | Santos Cordon <santoscordon@google.com> | Mon Nov 10 19:21:50 2014 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Mon Nov 10 19:21:50 2014 +0000 |
| tree | 6194a821d71e0167982426966fe848db1e953410 | |
| parent | de57ce8167f7c08f9dccefa976cd12155dfd85b8 [diff] | |
| parent | 84d4efc1444996ca4344740d823454f45b0dee80 [diff] |
Merge "Make add-call a global property of telecom. (3/4)" into lmp-mr1-dev
diff --git a/src/com/android/services/telephony/CdmaConnection.java b/src/com/android/services/telephony/CdmaConnection.java index d2988da..c52a824 100644 --- a/src/com/android/services/telephony/CdmaConnection.java +++ b/src/com/android/services/telephony/CdmaConnection.java
@@ -160,9 +160,6 @@ if (mAllowMute) { capabilities |= PhoneCapabilities.MUTE; } - if (getConference() == null) { - capabilities |= PhoneCapabilities.ADD_CALL; - } return capabilities; }
diff --git a/src/com/android/services/telephony/GsmConnection.java b/src/com/android/services/telephony/GsmConnection.java index 4482d36..d2e68c6 100644 --- a/src/com/android/services/telephony/GsmConnection.java +++ b/src/com/android/services/telephony/GsmConnection.java
@@ -48,7 +48,6 @@ @Override protected int buildCallCapabilities() { int capabilities = super.buildCallCapabilities(); - capabilities |= PhoneCapabilities.ADD_CALL; capabilities |= PhoneCapabilities.MUTE; capabilities |= PhoneCapabilities.SUPPORT_HOLD; if (getState() == STATE_ACTIVE || getState() == STATE_HOLDING) {
diff --git a/src/com/android/services/telephony/TelephonyConference.java b/src/com/android/services/telephony/TelephonyConference.java index 7736dc1..fc009bc 100644 --- a/src/com/android/services/telephony/TelephonyConference.java +++ b/src/com/android/services/telephony/TelephonyConference.java
@@ -42,7 +42,6 @@ public TelephonyConference(PhoneAccountHandle phoneAccount) { super(phoneAccount); setCapabilities( - PhoneCapabilities.ADD_CALL | PhoneCapabilities.SUPPORT_HOLD | PhoneCapabilities.HOLD | PhoneCapabilities.MUTE |
diff --git a/src/com/android/services/telephony/TelephonyConnection.java b/src/com/android/services/telephony/TelephonyConnection.java index 30312bb..056f62f 100644 --- a/src/com/android/services/telephony/TelephonyConnection.java +++ b/src/com/android/services/telephony/TelephonyConnection.java
@@ -396,7 +396,6 @@ protected int buildCallCapabilities() { int callCapabilities = 0; if (isImsConnection()) { - callCapabilities |= PhoneCapabilities.ADD_CALL; callCapabilities |= PhoneCapabilities.SUPPORT_HOLD; if (getState() == STATE_ACTIVE || getState() == STATE_HOLDING) { callCapabilities |= PhoneCapabilities.HOLD;