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

Commit 7161e8e6 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "IMS Connection Capabilities Update"

parents f6697566 7fadf5f4

telecomm/java/android/telecom/Conference.java

+8 −2
Original line number Diff line number Diff line
@@ -163,7 +163,10 @@ public abstract class Conference implements IConferenceable { 
     * @hide

     */

    public void removeCapability(int capability) {

        mConnectionCapabilities &= ~capability;

        int newCapabilities = mConnectionCapabilities;

        newCapabilities &= ~capability;



        setConnectionCapabilities(newCapabilities);

    }



    /**
@@ -173,7 +176,10 @@ public abstract class Conference implements IConferenceable { 
     * @hide

     */

    public void addCapability(int capability) {

        mConnectionCapabilities |= capability;

        int newCapabilities = mConnectionCapabilities;

        newCapabilities |= capability;



        setConnectionCapabilities(newCapabilities);

    }



    /**