summaryrefslogtreecommitdiffstats
path: root/telecomm/java/android
diff options
context:
space:
mode:
authorOmkar Kolangade <omkark@codeaurora.org>2015-03-23 17:51:16 -0700
committerLinux Build Service Account <lnxbuild@localhost>2015-10-06 03:26:16 -0600
commit4f3fd69a2c277ca65295cfe0a102ee7f43f7e578 (patch)
tree53b445fb9f7022a9cb687f1b940eacee65967873 /telecomm/java/android
parentfb3c8b820a7a8ffb3c2b5886ebd77e7eba126b48 (diff)
downloadframeworks_base-4f3fd69a2c277ca65295cfe0a102ee7f43f7e578.zip
frameworks_base-4f3fd69a2c277ca65295cfe0a102ee7f43f7e578.tar.gz
frameworks_base-4f3fd69a2c277ca65295cfe0a102ee7f43f7e578.tar.bz2
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
Diffstat (limited to 'telecomm/java/android')
-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 77fdb65..79fad93 100644
--- a/telecomm/java/android/telecom/Conference.java
+++ b/telecomm/java/android/telecom/Conference.java
@@ -160,7 +160,10 @@ public abstract class Conference extends Conferenceable {
* @hide
*/
public void removeCapability(int capability) {
- mConnectionCapabilities &= ~capability;
+ int newCapabilities = mConnectionCapabilities;
+ newCapabilities &= ~capability;
+
+ setConnectionCapabilities(newCapabilities);
}
/**
@@ -170,7 +173,10 @@ public abstract class Conference extends Conferenceable {
* @hide
*/
public void addCapability(int capability) {
- mConnectionCapabilities |= capability;
+ int newCapabilities = mConnectionCapabilities;
+ newCapabilities |= capability;
+
+ setConnectionCapabilities(newCapabilities);
}
/**