diff options
| author | Tyler Gunn <tgunn@google.com> | 2015-03-18 12:39:23 -0700 |
|---|---|---|
| committer | Tyler Gunn <tgunn@google.com> | 2015-03-18 12:39:23 -0700 |
| commit | 96d6c40c7159a6e93c21a3b540e24a6ff916cb4b (patch) | |
| tree | c102abab08e7c33fd8a8a9e46d058da2b853cdc5 /telecomm/java/android/telecom | |
| parent | ac1496a1c9d238d068d30b95f1b78aa66775e1db (diff) | |
| parent | 00de38a188211526e5fc1929b00410991dfb87fa (diff) | |
| download | frameworks_base-96d6c40c7159a6e93c21a3b540e24a6ff916cb4b.zip frameworks_base-96d6c40c7159a6e93c21a3b540e24a6ff916cb4b.tar.gz frameworks_base-96d6c40c7159a6e93c21a3b540e24a6ff916cb4b.tar.bz2 | |
resolved conflicts for merge of 00de38a1 to master
Change-Id: Ib1ac99ba7181ad79af94a04124380833bcb79a0c
Diffstat (limited to 'telecomm/java/android/telecom')
| -rw-r--r-- | telecomm/java/android/telecom/Call.java | 19 | ||||
| -rw-r--r-- | telecomm/java/android/telecom/Connection.java | 17 |
2 files changed, 26 insertions, 10 deletions
diff --git a/telecomm/java/android/telecom/Call.java b/telecomm/java/android/telecom/Call.java index ab58651..22b7bb1 100644 --- a/telecomm/java/android/telecom/Call.java +++ b/telecomm/java/android/telecom/Call.java @@ -208,16 +208,22 @@ public final class Call { */ public static final int CAPABILITY_WIFI = 0x00010000; - //****************************************************************************************** - // Next CAPABILITY value: 0x00020000 - //****************************************************************************************** - /** * Indicates that the current device callback number should be shown. * * @hide */ - public static final int CAPABILITY_SHOW_CALLBACK_NUMBER = 0x00008000; + public static final int CAPABILITY_SHOW_CALLBACK_NUMBER = 0x00020000; + + /** + * Speed up audio setup for MT call. + * @hide + */ + public static final int CAPABILITY_SPEED_UP_MT_AUDIO = 0x00040000; + + //********************************************************************************************** + // Next CAPABILITY value: 0x00080000 + //********************************************************************************************** private final Uri mHandle; private final int mHandlePresentation; @@ -316,6 +322,9 @@ public final class Call { if (can(capabilities, CAPABILITY_SHOW_CALLBACK_NUMBER)) { builder.append(" CAPABILITY_SHOW_CALLBACK_NUMBER"); } + if (can(capabilities, CAPABILITY_SPEED_UP_MT_AUDIO)) { + builder.append(" CAPABILITY_SPEED_UP_IMS_MT_AUDIO"); + } builder.append("]"); return builder.toString(); } diff --git a/telecomm/java/android/telecom/Connection.java b/telecomm/java/android/telecom/Connection.java index f7a19f8..a335e47 100644 --- a/telecomm/java/android/telecom/Connection.java +++ b/telecomm/java/android/telecom/Connection.java @@ -173,18 +173,22 @@ public abstract class Connection implements IConferenceable { */ public static final int CAPABILITY_WIFI = 0x000010000; - //********************************************************************************************** - // Next CAPABILITY value: 0x00020000 - //********************************************************************************************** - /** * Indicates that the current device callback number should be shown. * * @hide */ - public static final int CAPABILITY_SHOW_CALLBACK_NUMBER = 0x00008000; + public static final int CAPABILITY_SHOW_CALLBACK_NUMBER = 0x00020000; + /** + * Speed up audio setup for MT call. + * @hide + */ + public static final int CAPABILITY_SPEED_UP_MT_AUDIO = 0x00040000; + //********************************************************************************************** + // Next CAPABILITY value: 0x00080000 + //********************************************************************************************** // Flag controlling whether PII is emitted into the logs private static final boolean PII_DEBUG = Log.isLoggable(android.util.Log.DEBUG); @@ -287,6 +291,9 @@ public abstract class Connection implements IConferenceable { if (can(capabilities, CAPABILITY_SHOW_CALLBACK_NUMBER)) { builder.append(" CAPABILITY_SHOW_CALLBACK_NUMBER"); } + if (can(capabilities, CAPABILITY_SPEED_UP_MT_AUDIO)) { + builder.append(" CAPABILITY_SPEED_UP_IMS_MT_AUDIO"); + } builder.append("]"); return builder.toString(); } |