diff options
| author | Vinit Deshpande <vinitd@google.com> | 2015-04-16 02:36:02 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-04-16 02:36:30 +0000 |
| commit | cb43ebb3604d45da8677b8d19c935f0ace08ea53 (patch) | |
| tree | caf1ac41223ad3999b134d49fcd62a7f6783b41b /telecomm | |
| parent | 7400df9487151a9d53d00a0cc973a0164d22aecd (diff) | |
| parent | 80047faad914c9b9b4966d6b58fc22800c3fcebc (diff) | |
| download | frameworks_base-cb43ebb3604d45da8677b8d19c935f0ace08ea53.zip frameworks_base-cb43ebb3604d45da8677b8d19c935f0ace08ea53.tar.gz frameworks_base-cb43ebb3604d45da8677b8d19c935f0ace08ea53.tar.bz2 | |
Merge "am b5e0cfb..557d2f5 from mirror-m-wireless-internal-release"
Diffstat (limited to 'telecomm')
| -rw-r--r-- | telecomm/java/android/telecom/Call.java | 16 | ||||
| -rw-r--r-- | telecomm/java/android/telecom/Connection.java | 14 |
2 files changed, 25 insertions, 5 deletions
diff --git a/telecomm/java/android/telecom/Call.java b/telecomm/java/android/telecom/Call.java index 719dd76..33a7fe1 100644 --- a/telecomm/java/android/telecom/Call.java +++ b/telecomm/java/android/telecom/Call.java @@ -203,14 +203,21 @@ public final class Call { */ public static final int CAPABILITY_SPEED_UP_MT_AUDIO = 0x00040000; - /** - * Call type can be modified for IMS call + /** + * Call can be upgraded to a video call. * @hide */ public static final int CAPABILITY_CAN_UPGRADE_TO_VIDEO = 0x00080000; + /** + * For video calls, indicates whether the outgoing video for the call can be paused using + * the {@link android.telecom.VideoProfile.VideoState#PAUSED} VideoState. + * @hide + */ + public static final int CAPABILITY_CAN_PAUSE_VIDEO = 0x00100000; + //****************************************************************************************** - // Next CAPABILITY value: 0x00100000 + // Next CAPABILITY value: 0x00200000 //****************************************************************************************** private final Uri mHandle; @@ -315,6 +322,9 @@ public final class Call { if (can(capabilities, CAPABILITY_CAN_UPGRADE_TO_VIDEO)) { builder.append(" CAPABILITY_CAN_UPGRADE_TO_VIDEO"); } + if (can(capabilities, CAPABILITY_CAN_PAUSE_VIDEO)) { + builder.append(" CAPABILITY_CAN_PAUSE_VIDEO"); + } builder.append("]"); return builder.toString(); } diff --git a/telecomm/java/android/telecom/Connection.java b/telecomm/java/android/telecom/Connection.java index 3a54b1c..4762031 100644 --- a/telecomm/java/android/telecom/Connection.java +++ b/telecomm/java/android/telecom/Connection.java @@ -184,13 +184,20 @@ public abstract class Connection implements IConferenceable { public static final int CAPABILITY_SPEED_UP_MT_AUDIO = 0x00040000; /** - * Call type can be modified for IMS call + * Call can be upgraded to a video call. * @hide */ public static final int CAPABILITY_CAN_UPGRADE_TO_VIDEO = 0x00080000; + /** + * For video calls, indicates whether the outgoing video for the call can be paused using + * the {@link android.telecom.VideoProfile.VideoState#PAUSED} VideoState. + * @hide + */ + public static final int CAPABILITY_CAN_PAUSE_VIDEO = 0x00100000; + //********************************************************************************************** - // Next CAPABILITY value: 0x00100000 + // Next CAPABILITY value: 0x00200000 //********************************************************************************************** /** @@ -342,6 +349,9 @@ public abstract class Connection implements IConferenceable { if (can(capabilities, CAPABILITY_CAN_UPGRADE_TO_VIDEO)) { builder.append(" CAPABILITY_CAN_UPGRADE_TO_VIDEO"); } + if (can(capabilities, CAPABILITY_CAN_PAUSE_VIDEO)) { + builder.append(" CAPABILITY_CAN_PAUSE_VIDEO"); + } builder.append("]"); return builder.toString(); } |