commit bb2979d61c9cabd6f0476cc9e2121616d8001567
author Yorke Lee <yorkelee@google.com> Tue Apr 21 21:49:30 2015 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Apr 21 21:49:32 2015 +0000
tree fffec2643b00c47c44be5061abcf9c49a6074b5c
parent 6eededad96f5627d3206465ab8d85e2000177367
parent e661d9fb6fb4bd0896d2b911178b7d5f76d941ec

Merge "Make CAPABILITY_CAN_PAUSE_VIDEO public"

api/current.txt

diff --git a/api/current.txt b/api/current.txt
index 83a81d5..1d2d96b 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -30062,6 +30062,7 @@
     method public int getHandlePresentation();
     method public android.telecom.StatusHints getStatusHints();
     method public int getVideoState();
+    field public static final int CAPABILITY_CAN_PAUSE_VIDEO = 1048576; // 0x100000
     field public static final int CAPABILITY_DISCONNECT_FROM_CONFERENCE = 8192; // 0x2000
     field public static final int CAPABILITY_GENERIC_CONFERENCE = 16384; // 0x4000
     field public static final int CAPABILITY_HIGH_DEF_AUDIO = 32768; // 0x8000

api/system-current.txt

diff --git a/api/system-current.txt b/api/system-current.txt
index 9e98f28..17e438c 100644
--- a/api/system-current.txt
+++ b/api/system-current.txt
@@ -32167,6 +32167,7 @@
     method public int getHandlePresentation();
     method public android.telecom.StatusHints getStatusHints();
     method public int getVideoState();
+    field public static final int CAPABILITY_CAN_PAUSE_VIDEO = 1048576; // 0x100000
     field public static final int CAPABILITY_DISCONNECT_FROM_CONFERENCE = 8192; // 0x2000
     field public static final int CAPABILITY_GENERIC_CONFERENCE = 16384; // 0x4000
     field public static final int CAPABILITY_HIGH_DEF_AUDIO = 32768; // 0x8000

telecomm/java/android/telecom/Call.java

diff --git a/telecomm/java/android/telecom/Call.java b/telecomm/java/android/telecom/Call.java
index a46585a..bbd5e30 100644
--- a/telecomm/java/android/telecom/Call.java
+++ b/telecomm/java/android/telecom/Call.java
@@ -213,7 +213,6 @@
         /**
          * 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;