diff options
| author | Yorke Lee <yorkelee@google.com> | 2015-04-21 13:42:24 -0700 |
|---|---|---|
| committer | Yorke Lee <yorkelee@google.com> | 2015-04-21 13:42:24 -0700 |
| commit | e661d9fb6fb4bd0896d2b911178b7d5f76d941ec (patch) | |
| tree | 7a6d5d4bb3c911fb8a7a69e7a8f210617b667a6a | |
| parent | 8d505ff025f16715d47f97d0f74a0cbba6c6391d (diff) | |
| download | frameworks_base-e661d9fb6fb4bd0896d2b911178b7d5f76d941ec.zip frameworks_base-e661d9fb6fb4bd0896d2b911178b7d5f76d941ec.tar.gz frameworks_base-e661d9fb6fb4bd0896d2b911178b7d5f76d941ec.tar.bz2 | |
Make CAPABILITY_CAN_PAUSE_VIDEO public
Change-Id: If20f642a3d6bda886a68bb1e0ce459c38361a73c
| -rw-r--r-- | api/current.txt | 1 | ||||
| -rw-r--r-- | api/system-current.txt | 1 | ||||
| -rw-r--r-- | telecomm/java/android/telecom/Call.java | 1 |
3 files changed, 2 insertions, 1 deletions
diff --git a/api/current.txt b/api/current.txt index 75fb910..4ca4f54 100644 --- a/api/current.txt +++ b/api/current.txt @@ -30060,6 +30060,7 @@ package android.telecom { 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 diff --git a/api/system-current.txt b/api/system-current.txt index 1386e4c..61cd6e3c 100644 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -32165,6 +32165,7 @@ package android.telecom { 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 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 @@ public final class Call { /** * 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; |