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

Commit deb779c0 authored by Hall Liu's avatar Hall Liu Committed by android-build-merger
Browse files

Merge \\"Add PROPERTY_IS_DOWNGRADED_CONFERENCE\\" into nyc-mr1-dev am: 810ae1ec 

am: 2a07f0de

Change-Id: I75260ce07bafbf45651d1582c0aa7937440d4584
parents c063bbe8 2a07f0de

telecomm/java/android/telecom/Connection.java

+7 −1
Original line number Diff line number Diff line
@@ -370,8 +370,14 @@ public abstract class Connection extends Conferenceable { 
     */

    public static final int PROPERTY_HAS_CDMA_VOICE_PRIVACY = 1<<5;



    /**

     * Indicates that the connection represents a downgraded IMS conference.

     * @hide

     */

    public static final int PROPERTY_IS_DOWNGRADED_CONFERENCE = 1<<6;



    //**********************************************************************************************

    // Next PROPERTY value: 1<<6

    // Next PROPERTY value: 1<<7

    //**********************************************************************************************



    /**