summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOmkar Kolangade <omkark@codeaurora.org>2015-03-23 17:51:16 -0700
committerDeepak Kundra <deepakkundra@gmail.com>2015-08-11 16:51:53 -0700
commite6e9c3b8d7d4870c67bca90b7073e429fbc76f39 (patch)
treed711a0ad5dae55c17bc925dbac38ee256a754437
parent2a4727ca2a329cfccbf42f6b5cbf33075f95ea1c (diff)
downloadandroid_frameworks_base-e6e9c3b8d7d4870c67bca90b7073e429fbc76f39.tar.gz
android_frameworks_base-e6e9c3b8d7d4870c67bca90b7073e429fbc76f39.tar.bz2
android_frameworks_base-e6e9c3b8d7d4870c67bca90b7073e429fbc76f39.zip
IMS Connection Capabilities Update
IMS connection capabilities were not getting propagated to the upper layers whenever a capability was added or removed. Adding the same. Change-Id: Ic67d76df05c8b2a1b8abaf27f266fe9693764e52 CRs-Fixed: 806868
-rw-r--r--telecomm/java/android/telecom/Conference.java10
1 files changed, 8 insertions, 2 deletions
diff --git a/telecomm/java/android/telecom/Conference.java b/telecomm/java/android/telecom/Conference.java
index 4e27afcb24e..d5060a862f0 100644
--- a/telecomm/java/android/telecom/Conference.java
+++ b/telecomm/java/android/telecom/Conference.java
@@ -156,7 +156,10 @@ public abstract class Conference implements IConferenceable {
* @hide
*/
public void removeCapability(int capability) {
- mConnectionCapabilities &= ~capability;
+ int newCapabilities = mConnectionCapabilities;
+ newCapabilities &= ~capability;
+
+ setConnectionCapabilities(newCapabilities);
}
/**
@@ -166,7 +169,10 @@ public abstract class Conference implements IConferenceable {
* @hide
*/
public void addCapability(int capability) {
- mConnectionCapabilities |= capability;
+ int newCapabilities = mConnectionCapabilities;
+ newCapabilities |= capability;
+
+ setConnectionCapabilities(newCapabilities);
}
/**