Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a0a8f756 authored by Omkar Kolangade's avatar Omkar Kolangade Committed by android-build-merger
Browse files

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

am: 4aeafd8f

* commit '4aeafd8f':
  IMS Connection Capabilities Update
parents 342006e9 4aeafd8f

telecomm/java/android/telecom/Conference.java

+8 −2
Original line number Diff line number Diff line
@@ -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);

    }



    /**