Merge "Hiding Video telephony related APIs." into lmp-dev

This commit is contained in:
Tyler Gunn
2014-08-22 17:12:56 +00:00
committed by Android (Google) Code Review
6 changed files with 11 additions and 65 deletions

View File

@@ -87,6 +87,7 @@ public abstract class Connection {
public void onConferenceChanged(Connection c, Conference conference) {}
}
/** @hide */
public static abstract class VideoProvider {
/**
@@ -528,6 +529,7 @@ public abstract class Connection {
* {@link VideoProfile.VideoState#RX_ENABLED}.
*
* @return The video state of the call.
* @hide
*/
public final int getVideoState() {
return mVideoState;
@@ -699,6 +701,7 @@ public abstract class Connection {
* {@link VideoProfile.VideoState#RX_ENABLED}.
*
* @param videoState The new video state.
* @hide
*/
public final void setVideoState(int videoState) {
Log.d(this, "setVideoState %d", videoState);
@@ -755,6 +758,7 @@ public abstract class Connection {
/**
* Sets the video call provider.
* @param videoProvider The video provider.
* @hide
*/
public final void setVideoProvider(VideoProvider videoProvider) {
mVideoProvider = videoProvider;
@@ -763,6 +767,7 @@ public abstract class Connection {
}
}
/** @hide */
public final VideoProvider getVideoProvider() {
return mVideoProvider;
}

View File

@@ -93,6 +93,7 @@ public final class ConnectionRequest implements Parcelable {
* {@link VideoProfile.VideoState#RX_ENABLED}.
*
* @return The video state for the connection.
* @hide
*/
public int getVideoState() {
return mVideoState;

View File

@@ -158,6 +158,7 @@ public final class RemoteConnection {
*
* @param connection The {@code RemoteConnection} invoking this method.
* @param videoState The new video state of the {@code RemoteConnection}.
* @hide
*/
public void onVideoStateChanged(RemoteConnection connection, int videoState) {}
@@ -357,6 +358,7 @@ public final class RemoteConnection {
/**
* @return The video state of the {@code RemoteConnection}. See
* {@link VideoProfile.VideoState}.
* @hide
*/
public int getVideoState() {
return mVideoState;

View File

@@ -76,6 +76,7 @@ public class TelecommManager {
* {@link VideoProfile.VideoState#BIDIRECTIONAL},
* {@link VideoProfile.VideoState#RX_ENABLED},
* {@link VideoProfile.VideoState#TX_ENABLED}.
* @hide
*/
public static final String EXTRA_START_CALL_WITH_VIDEO_STATE =
"android.intent.extra.START_CALL_WITH_VIDEO_STATE";

View File

@@ -21,6 +21,8 @@ import android.os.Parcelable;
/**
* Represents attributes of video calls.
*
* {@hide}
*/
public class VideoProfile implements Parcelable {
/**