commit 4aeafd8f27852bdb684711f1df807ff0e59cb354
author Tyler Gunn <tgunn@google.com> Mon Feb 29 18:06:25 2016 +0000
committer Android Partner Code Review <android-gerrit-partner@google.com> Mon Feb 29 18:06:25 2016 +0000
tree d590a8da5202a045080991154b2d14f49b87b662
parent 99eb21d172348936cb42202f295ae6478272a39f
parent a0f46a9e7d445852e1746594f0e90ea985f7d5bf

Merge "IMS Connection Capabilities Update" into mm-wireless-dev

telecomm/java/android/telecom/Conference.java

diff --git a/telecomm/java/android/telecom/Conference.java b/telecomm/java/android/telecom/Conference.java
index 094b3a9..1b70d65 100644
--- a/telecomm/java/android/telecom/Conference.java
+++ b/telecomm/java/android/telecom/Conference.java
@@ -181,7 +181,10 @@
      * @hide
      */
     public void removeCapability(int capability) {
-        mConnectionCapabilities &= ~capability;
+        int newCapabilities = mConnectionCapabilities;
+        newCapabilities &= ~capability;
+
+        setConnectionCapabilities(newCapabilities);
     }
 
     /**
@@ -191,7 +194,10 @@
      * @hide
      */
     public void addCapability(int capability) {
-        mConnectionCapabilities |= capability;
+        int newCapabilities = mConnectionCapabilities;
+        newCapabilities |= capability;
+
+        setConnectionCapabilities(newCapabilities);
     }
 
     /**