Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
am: 4aeafd8f27

* commit '4aeafd8f27852bdb684711f1df807ff0e59cb354':
  IMS Connection Capabilities Update
This commit is contained in:
Omkar Kolangade
2016-02-29 18:10:06 +00:00
committed by android-build-merger
parent 342006e919 4aeafd8f27
commit a0a8f75699
1 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
telecomm/java/android/telecom/Conference.java
View File

@@ -181,7 +181,10 @@ public abstract class Conference extends Conferenceable {
* @hide
*/
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
*/
public void addCapability(int capability) {
mConnectionCapabilities |= capability;
int newCapabilities = mConnectionCapabilities;
newCapabilities |= capability;
setConnectionCapabilities(newCapabilities);
}
/**