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

Commit 810ae1ec authored by Hall Liu's avatar Hall Liu Committed by Android (Google) Code Review
Browse files

Merge "Add PROPERTY_IS_DOWNGRADED_CONFERENCE" into nyc-mr1-dev

parents c024e480 9f332c7f
Loading
Loading
Loading
Loading
+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
    //**********************************************************************************************

    /**