Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Un-@hiding some missed VT APIs." into mnc-dev

Browse Source
This commit is contained in:
Tyler Gunn
2015-05-08 19:57:39 +00:00
committed by Android (Google) Code Review
parent 4ca9955d39 6b3714939f
commit 6624015e4f
6 changed files with 34 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
api/current.txt
View File

@@ -30164,6 +30164,8 @@ package android.telecom {
method public android.telecom.Connection getPrimaryConnection();
method public final int getState();
method public final android.telecom.StatusHints getStatusHints();
method public android.telecom.Connection.VideoProvider getVideoProvider();
method public int getVideoState();
method public void onAudioStateChanged(android.telecom.AudioState);
method public void onConnectionAdded(android.telecom.Connection);
method public void onDisconnect();
@@ -30183,6 +30185,8 @@ package android.telecom {
method public final void setDisconnected(android.telecom.DisconnectCause);
method public final void setOnHold();
method public final void setStatusHints(android.telecom.StatusHints);
method public final void setVideoProvider(android.telecom.Connection, android.telecom.Connection.VideoProvider);
method public final void setVideoState(android.telecom.Connection, int);
field public static final long CONNECT_TIME_NOT_SPECIFIED = 0L; // 0x0L
}
@@ -30210,6 +30214,7 @@ package android.telecom {
method public final android.telecom.Connection.VideoProvider getVideoProvider();
method public final boolean isRingbackRequested();
method public void onAbort();
method public void onAnswer(int);
method public void onAnswer();
method public void onAudioStateChanged(android.telecom.AudioState);
method public void onDisconnect();
@@ -30239,7 +30244,11 @@ package android.telecom {
method public final void setRingbackRequested(boolean);
method public final void setRinging();
method public final void setStatusHints(android.telecom.StatusHints);
method public final void setVideoProvider(android.telecom.Connection.VideoProvider);
method public final void setVideoState(int);
method public static java.lang.String stateToString(int);
field public static final int CAPABILITY_CAN_PAUSE_VIDEO = 1048576; // 0x100000
field public static final int CAPABILITY_CAN_UPGRADE_TO_VIDEO = 524288; // 0x80000
field public static final int CAPABILITY_DISCONNECT_FROM_CONFERENCE = 8192; // 0x2000
field public static final int CAPABILITY_HOLD = 1; // 0x1
field public static final int CAPABILITY_MANAGE_CONFERENCE = 128; // 0x80
@@ -30247,6 +30256,12 @@ package android.telecom {
field public static final int CAPABILITY_MUTE = 64; // 0x40
field public static final int CAPABILITY_RESPOND_VIA_TEXT = 32; // 0x20
field public static final int CAPABILITY_SEPARATE_FROM_CONFERENCE = 4096; // 0x1000
field public static final int CAPABILITY_SUPPORTS_VT_LOCAL_BIDIRECTIONAL = 768; // 0x300
field public static final int CAPABILITY_SUPPORTS_VT_LOCAL_RX = 256; // 0x100
field public static final int CAPABILITY_SUPPORTS_VT_LOCAL_TX = 512; // 0x200
field public static final int CAPABILITY_SUPPORTS_VT_REMOTE_BIDIRECTIONAL = 3072; // 0xc00
field public static final int CAPABILITY_SUPPORTS_VT_REMOTE_RX = 1024; // 0x400
field public static final int CAPABILITY_SUPPORTS_VT_REMOTE_TX = 2048; // 0x800
field public static final int CAPABILITY_SUPPORT_HOLD = 2; // 0x2
field public static final int CAPABILITY_SWAP_CONFERENCE = 8; // 0x8
field public static final int STATE_ACTIVE = 4; // 0x4
@@ -30292,10 +30307,12 @@ package android.telecom {
public final class ConnectionRequest implements android.os.Parcelable {
ctor public ConnectionRequest(android.telecom.PhoneAccountHandle, android.net.Uri, android.os.Bundle);
ctor public ConnectionRequest(android.telecom.PhoneAccountHandle, android.net.Uri, android.os.Bundle, int);
method public int describeContents();
method public android.telecom.PhoneAccountHandle getAccountHandle();
method public android.net.Uri getAddress();
method public android.os.Bundle getExtras();
method public int getVideoState();
method public void writeToParcel(android.os.Parcel, int);
field public static final android.os.Parcelable.Creator<android.telecom.ConnectionRequest> CREATOR;
}

17
api/system-current.txt
View File

@@ -32285,6 +32285,8 @@ package android.telecom {
method public android.telecom.Connection getPrimaryConnection();
method public final int getState();
method public final android.telecom.StatusHints getStatusHints();
method public android.telecom.Connection.VideoProvider getVideoProvider();
method public int getVideoState();
method public void onAudioStateChanged(android.telecom.AudioState);
method public void onConnectionAdded(android.telecom.Connection);
method public void onDisconnect();
@@ -32304,6 +32306,8 @@ package android.telecom {
method public final void setDisconnected(android.telecom.DisconnectCause);
method public final void setOnHold();
method public final void setStatusHints(android.telecom.StatusHints);
method public final void setVideoProvider(android.telecom.Connection, android.telecom.Connection.VideoProvider);
method public final void setVideoState(android.telecom.Connection, int);
field public static final long CONNECT_TIME_NOT_SPECIFIED = 0L; // 0x0L
}
@@ -32331,6 +32335,7 @@ package android.telecom {
method public final android.telecom.Connection.VideoProvider getVideoProvider();
method public final boolean isRingbackRequested();
method public void onAbort();
method public void onAnswer(int);
method public void onAnswer();
method public void onAudioStateChanged(android.telecom.AudioState);
method public void onDisconnect();
@@ -32360,7 +32365,11 @@ package android.telecom {
method public final void setRingbackRequested(boolean);
method public final void setRinging();
method public final void setStatusHints(android.telecom.StatusHints);
method public final void setVideoProvider(android.telecom.Connection.VideoProvider);
method public final void setVideoState(int);
method public static java.lang.String stateToString(int);
field public static final int CAPABILITY_CAN_PAUSE_VIDEO = 1048576; // 0x100000
field public static final int CAPABILITY_CAN_UPGRADE_TO_VIDEO = 524288; // 0x80000
field public static final int CAPABILITY_DISCONNECT_FROM_CONFERENCE = 8192; // 0x2000
field public static final int CAPABILITY_HOLD = 1; // 0x1
field public static final int CAPABILITY_MANAGE_CONFERENCE = 128; // 0x80
@@ -32368,6 +32377,12 @@ package android.telecom {
field public static final int CAPABILITY_MUTE = 64; // 0x40
field public static final int CAPABILITY_RESPOND_VIA_TEXT = 32; // 0x20
field public static final int CAPABILITY_SEPARATE_FROM_CONFERENCE = 4096; // 0x1000
field public static final int CAPABILITY_SUPPORTS_VT_LOCAL_BIDIRECTIONAL = 768; // 0x300
field public static final int CAPABILITY_SUPPORTS_VT_LOCAL_RX = 256; // 0x100
field public static final int CAPABILITY_SUPPORTS_VT_LOCAL_TX = 512; // 0x200
field public static final int CAPABILITY_SUPPORTS_VT_REMOTE_BIDIRECTIONAL = 3072; // 0xc00
field public static final int CAPABILITY_SUPPORTS_VT_REMOTE_RX = 1024; // 0x400
field public static final int CAPABILITY_SUPPORTS_VT_REMOTE_TX = 2048; // 0x800
field public static final int CAPABILITY_SUPPORT_HOLD = 2; // 0x2
field public static final int CAPABILITY_SWAP_CONFERENCE = 8; // 0x8
field public static final int STATE_ACTIVE = 4; // 0x4
@@ -32413,10 +32428,12 @@ package android.telecom {
public final class ConnectionRequest implements android.os.Parcelable {
ctor public ConnectionRequest(android.telecom.PhoneAccountHandle, android.net.Uri, android.os.Bundle);
ctor public ConnectionRequest(android.telecom.PhoneAccountHandle, android.net.Uri, android.os.Bundle, int);
method public int describeContents();
method public android.telecom.PhoneAccountHandle getAccountHandle();
method public android.net.Uri getAddress();
method public android.os.Bundle getExtras();
method public int getVideoState();
method public void writeToParcel(android.os.Parcel, int);
field public static final android.os.Parcelable.Creator<android.telecom.ConnectionRequest> CREATOR;
}

4
telecomm/java/android/telecom/Conference.java
View File

@@ -179,7 +179,6 @@ public abstract class Conference implements Conferenceable {
/**
* Returns VideoProvider of the primary call. This can be null.
* @hide
*/
public VideoProvider getVideoProvider() {
return null;
@@ -187,7 +186,6 @@ public abstract class Conference implements Conferenceable {
/**
* Returns video state of the primary call.
* @hide
*/
public int getVideoState() {
return VideoProfile.VideoState.AUDIO_ONLY;
@@ -373,7 +371,6 @@ public abstract class Conference implements Conferenceable {
* {@link VideoProfile.VideoState#RX_ENABLED}.
*
* @param videoState The new video state.
* @hide
*/
public final void setVideoState(Connection c, int videoState) {
Log.d(this, "setVideoState Conference: %s Connection: %s VideoState: %s",
@@ -387,7 +384,6 @@ public abstract class Conference implements Conferenceable {
* Sets the video connection provider.
*
* @param videoProvider The video provider.
* @hide
*/
public final void setVideoProvider(Connection c, Connection.VideoProvider videoProvider) {
Log.d(this, "setVideoProvider Conference: %s Connection: %s VideoState: %s",

11
telecomm/java/android/telecom/Connection.java
View File

@@ -106,38 +106,32 @@ public abstract class Connection implements Conferenceable {
/**
* Local device supports receiving video.
* @hide
*/
public static final int CAPABILITY_SUPPORTS_VT_LOCAL_RX = 0x00000100;
/**
* Local device supports transmitting video.
* @hide
*/
public static final int CAPABILITY_SUPPORTS_VT_LOCAL_TX = 0x00000200;
/**
* Local device supports bidirectional video calling.
* @hide
*/
public static final int CAPABILITY_SUPPORTS_VT_LOCAL_BIDIRECTIONAL =
CAPABILITY_SUPPORTS_VT_LOCAL_RX | CAPABILITY_SUPPORTS_VT_LOCAL_TX;
/**
* Remote device supports receiving video.
* @hide
*/
public static final int CAPABILITY_SUPPORTS_VT_REMOTE_RX = 0x00000400;
/**
* Remote device supports transmitting video.
* @hide
*/
public static final int CAPABILITY_SUPPORTS_VT_REMOTE_TX = 0x00000800;
/**
* Remote device supports bidirectional video calling.
* @hide
*/
public static final int CAPABILITY_SUPPORTS_VT_REMOTE_BIDIRECTIONAL =
CAPABILITY_SUPPORTS_VT_REMOTE_RX | CAPABILITY_SUPPORTS_VT_REMOTE_TX;
@@ -187,14 +181,12 @@ public abstract class Connection implements Conferenceable {
/**
* 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;
@@ -1041,7 +1033,6 @@ public abstract class Connection implements Conferenceable {
* {@link VideoProfile.VideoState#RX_ENABLED}.
*
* @param videoState The new video state.
* @hide
*/
public final void setVideoState(int videoState) {
checkImmutable();
@@ -1105,7 +1096,6 @@ public abstract class Connection implements Conferenceable {
/**
* Sets the video connection provider.
* @param videoProvider The video provider.
* @hide
*/
public final void setVideoProvider(VideoProvider videoProvider) {
checkImmutable();
@@ -1414,7 +1404,6 @@ public abstract class Connection implements Conferenceable {
* a request to accept.
*
* @param videoState The video state in which to answer the connection.
* @hide
*/
public void onAnswer(int videoState) {}

2
telecomm/java/android/telecom/ConnectionRequest.java
View File

@@ -50,7 +50,6 @@ public final class ConnectionRequest implements Parcelable {
* @param handle The handle (e.g., phone number) to which the {@link Connection} is to connect.
* @param extras Application-specific extra data.
* @param videoState Determines the video state for the connection.
* @hide
*/
public ConnectionRequest(
PhoneAccountHandle accountHandle,
@@ -95,7 +94,6 @@ public final class ConnectionRequest implements Parcelable {
* {@link VideoProfile.VideoState#RX_ENABLED}.
*
* @return The video state for the connection.
* @hide
*/
public int getVideoState() {
return mVideoState;

1
telecomm/java/android/telecom/ConnectionService.java
View File

@@ -147,7 +147,6 @@ public abstract class ConnectionService extends Service {
}
@Override
/** @hide */
public void answerVideo(String callId, int videoState) {
SomeArgs args = SomeArgs.obtain();
args.arg1 = callId;