diff options
| author | 2016-07-18 17:54:48 +0000 | |
|---|---|---|
| committer | 2016-07-18 17:54:48 +0000 | |
| commit | 2a07f0de6be59721697dbb5d6247c5dbcc975d82 (patch) | |
| tree | 7a801822d11b1f5d00ca54af79d284a5ff6a9f25 | |
| parent | 7c3b9e2f8c53dc3279497503d7bcfd7a17406893 (diff) | |
| parent | 810ae1ec7b8b0db4e971b15df0073030ab411fa9 (diff) | |
Merge \"Add PROPERTY_IS_DOWNGRADED_CONFERENCE\" into nyc-mr1-dev
am: 810ae1ec7b
Change-Id: Ic4633dcf16425445f67c9810e2b80a446b4adee4
| -rw-r--r-- | telecomm/java/android/telecom/Connection.java | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/telecomm/java/android/telecom/Connection.java b/telecomm/java/android/telecom/Connection.java index 52f75f680560..ee055f45cecb 100644 --- a/telecomm/java/android/telecom/Connection.java +++ b/telecomm/java/android/telecom/Connection.java @@ -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 //********************************************************************************************** /** |