| commit | 84d4efc1444996ca4344740d823454f45b0dee80 | [log] [tgz] |
|---|---|---|
| author | Santos Cordon <santoscordon@google.com> | Fri Nov 07 16:11:05 2014 -0800 |
| committer | Santos Cordon <santoscordon@google.com> | Fri Nov 07 16:11:05 2014 -0800 |
| tree | 18de2a3b67c7fb55ac8a4af949b0bde7547e3874 | |
| parent | 2ccd0ac6a7c22e413733bf24c7c04e835445ab65 [diff] |
Make add-call a global property of telecom. (3/4) ADD_CALL didn't make sense as a property of Connection or Call. This changes it to be a global property instead. Bug: 18285352 Change-Id: I5e27a36a0f37a11dd200c87a87f2ec3d65629223
diff --git a/src/com/android/services/telephony/CdmaConnection.java b/src/com/android/services/telephony/CdmaConnection.java index 779cb70..3242e64 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 1632457..da03fa1 100644 --- a/src/com/android/services/telephony/GsmConnection.java +++ b/src/com/android/services/telephony/GsmConnection.java
@@ -65,7 +65,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 54529bb..b5e264c 100644 --- a/src/com/android/services/telephony/TelephonyConference.java +++ b/src/com/android/services/telephony/TelephonyConference.java
@@ -36,7 +36,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 e478d11..b9f9375 100644 --- a/src/com/android/services/telephony/TelephonyConnection.java +++ b/src/com/android/services/telephony/TelephonyConnection.java
@@ -382,7 +382,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;