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

This commit is contained in:
Tyler Gunn
2016-02-29 18:06:25 +00:00
committed by Android Partner Code Review

View File

@@ -181,7 +181,10 @@ public abstract class Conference extends Conferenceable {
* @hide * @hide
*/ */
public void removeCapability(int capability) { public void removeCapability(int capability) {
mConnectionCapabilities &= ~capability; int newCapabilities = mConnectionCapabilities;
newCapabilities &= ~capability;
setConnectionCapabilities(newCapabilities);
} }
/** /**
@@ -191,7 +194,10 @@ public abstract class Conference extends Conferenceable {
* @hide * @hide
*/ */
public void addCapability(int capability) { public void addCapability(int capability) {
mConnectionCapabilities |= capability; int newCapabilities = mConnectionCapabilities;
newCapabilities |= capability;
setConnectionCapabilities(newCapabilities);
} }
/** /**