diff options
| author | Tyler Gunn <tgunn@google.com> | 2015-03-18 13:09:14 -0700 |
|---|---|---|
| committer | Tyler Gunn <tgunn@google.com> | 2015-03-18 13:09:14 -0700 |
| commit | d11a31561e88fbbb4f614caff8a05e7ff9ecd357 (patch) | |
| tree | 0fa5abf46aee7e2144d4218d744401bbd963da2b | |
| parent | f9296808e95bea39d03e7c193c7676992ec453e1 (diff) | |
| parent | bcb17eb7a9e0c33efeaae8a213f331d678e5a736 (diff) | |
| download | frameworks_base-d11a31561e88fbbb4f614caff8a05e7ff9ecd357.zip frameworks_base-d11a31561e88fbbb4f614caff8a05e7ff9ecd357.tar.gz frameworks_base-d11a31561e88fbbb4f614caff8a05e7ff9ecd357.tar.bz2 | |
resolve merge conflicts of bcb17eb to m-wireless-dev.
Change-Id: Ic8211fb14caec993c8e38c790006577493f7a607
| -rw-r--r-- | telecomm/java/android/telecom/Call.java | 17 | ||||
| -rw-r--r-- | telecomm/java/android/telecom/Connection.java | 19 |
2 files changed, 28 insertions, 8 deletions
diff --git a/telecomm/java/android/telecom/Call.java b/telecomm/java/android/telecom/Call.java index ab58651..436f20a 100644 --- a/telecomm/java/android/telecom/Call.java +++ b/telecomm/java/android/telecom/Call.java @@ -187,7 +187,7 @@ public final class Call { * Call is able to be individually disconnected when in a {@code Conference}. */ public static final int CAPABILITY_DISCONNECT_FROM_CONFERENCE = 0x00002000; - + /** * Whether the call is a generic conference, where we do not know the precise state of * participants in the conference (eg. on CDMA). @@ -217,7 +217,17 @@ public final class Call { * * @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 +326,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_MT_AUDIO"); + } builder.append("]"); return builder.toString(); } diff --git a/telecomm/java/android/telecom/Connection.java b/telecomm/java/android/telecom/Connection.java index 98217f7..bab064e 100644 --- a/telecomm/java/android/telecom/Connection.java +++ b/telecomm/java/android/telecom/Connection.java @@ -171,20 +171,24 @@ public abstract class Connection implements IConferenceable { * Connection is using WIFI. * @hide */ - public static final int CAPABILITY_WIFI = 0x000010000; - - //********************************************************************************************** - // Next CAPABILITY value: 0x00020000 - //********************************************************************************************** + public static final int CAPABILITY_WIFI = 0x00010000; /** * 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_MT_AUDIO"); + } builder.append("]"); return builder.toString(); } |