summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDong Zhou <a22255@motorola.com>2015-03-17 22:28:22 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-03-17 22:28:22 +0000
commit94573dc5515d69458effc92b66922f757adde4d0 (patch)
treed14fff2aadc478c8cba529d74746b9adeae75ea1
parent4ff668d47ab9f49ec81606aec6d469ecd6ca37fa (diff)
parent89f41eb39e910e220957ac861651ead17eff9085 (diff)
downloadframeworks_base-94573dc5515d69458effc92b66922f757adde4d0.zip
frameworks_base-94573dc5515d69458effc92b66922f757adde4d0.tar.gz
frameworks_base-94573dc5515d69458effc92b66922f757adde4d0.tar.bz2
am 89f41eb3: Define the capability to speed up MT call audio
* commit '89f41eb39e910e220957ac861651ead17eff9085': Define the capability to speed up MT call audio
-rw-r--r--telecomm/java/android/telecom/Call.java11
-rw-r--r--telecomm/java/android/telecom/Connection.java9
2 files changed, 19 insertions, 1 deletions
diff --git a/telecomm/java/android/telecom/Call.java b/telecomm/java/android/telecom/Call.java
index bbf3384..d8a14ef 100644
--- a/telecomm/java/android/telecom/Call.java
+++ b/telecomm/java/android/telecom/Call.java
@@ -173,7 +173,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).
@@ -182,6 +182,12 @@ public final class Call {
*/
public static final int CAPABILITY_GENERIC_CONFERENCE = 0x00004000;
+ /**
+ * Speed up audio setup for MT call.
+ * @hide
+ */
+ public static final int CAPABILITY_SPEED_UP_MT_AUDIO = 0x00008000;
+
private final Uri mHandle;
private final int mHandlePresentation;
private final String mCallerDisplayName;
@@ -264,6 +270,9 @@ public final class Call {
if (can(capabilities, CAPABILITY_GENERIC_CONFERENCE)) {
builder.append(" CAPABILITY_GENERIC_CONFERENCE");
}
+ 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 03fec01..00a4136 100644
--- a/telecomm/java/android/telecom/Connection.java
+++ b/telecomm/java/android/telecom/Connection.java
@@ -147,6 +147,12 @@ public abstract class Connection implements IConferenceable {
*/
public static final int CAPABILITY_GENERIC_CONFERENCE = 0x00004000;
+ /**
+ * Speed up audio setup for MT call.
+ * @hide
+ */
+ public static final int CAPABILITY_SPEED_UP_MT_AUDIO = 0x00008000;
+
// Flag controlling whether PII is emitted into the logs
private static final boolean PII_DEBUG = Log.isLoggable(android.util.Log.DEBUG);
@@ -233,6 +239,9 @@ public abstract class Connection implements IConferenceable {
if (can(capabilities, CAPABILITY_GENERIC_CONFERENCE)) {
builder.append(" CAPABILITY_GENERIC_CONFERENCE");
}
+ if (can(capabilities, CAPABILITY_SPEED_UP_MT_AUDIO)) {
+ builder.append(" CAPABILITY_SPEED_UP_IMS_MT_AUDIO");
+ }
builder.append("]");
return builder.toString();
}