diff options
author | Tyler Gunn <tgunn@google.com> | 2014-08-21 16:38:40 -0700 |
---|---|---|
committer | Tyler Gunn <tgunn@google.com> | 2014-08-21 16:38:40 -0700 |
commit | 27d1e257f3cba2d5954e5562db69035df9ecf290 (patch) | |
tree | 54fd51a7a439ee113567b7511fa1198de2036891 | |
parent | 5cef4fa9c189a43ca081d74319f6046e4eba6b8d (diff) | |
download | frameworks_base-27d1e257f3cba2d5954e5562db69035df9ecf290.zip frameworks_base-27d1e257f3cba2d5954e5562db69035df9ecf290.tar.gz frameworks_base-27d1e257f3cba2d5954e5562db69035df9ecf290.tar.bz2 |
Hiding Video telephony related APIs.
Bug: 17188135
Change-Id: I2d4111dbad2430968a458f8f3bf4f2ca1becbbdd
-rw-r--r-- | api/current.txt | 65 | ||||
-rw-r--r-- | telecomm/java/android/telecomm/Connection.java | 5 | ||||
-rw-r--r-- | telecomm/java/android/telecomm/ConnectionRequest.java | 1 | ||||
-rw-r--r-- | telecomm/java/android/telecomm/RemoteConnection.java | 2 | ||||
-rw-r--r-- | telecomm/java/android/telecomm/TelecommManager.java | 1 | ||||
-rw-r--r-- | telecomm/java/android/telecomm/VideoProfile.java | 2 |
6 files changed, 11 insertions, 65 deletions
diff --git a/api/current.txt b/api/current.txt index 73f10b8..83b78af 100644 --- a/api/current.txt +++ b/api/current.txt @@ -28554,8 +28554,6 @@ package android.telecomm { method public final int getHandlePresentation(); method public final int getState(); method public final android.telecomm.StatusHints getStatusHints(); - method public final android.telecomm.Connection.VideoProvider getVideoProvider(); - method public final int getVideoState(); method public final boolean isRequestingRingback(); method public void onAbort(); method public void onAnswer(int); @@ -28587,8 +28585,6 @@ package android.telecomm { method public final void setRequestingRingback(boolean); method public final void setRinging(); method public final void setStatusHints(android.telecomm.StatusHints); - method public final void setVideoProvider(android.telecomm.Connection.VideoProvider); - method public final void setVideoState(int); method public final void startActivityFromInCall(android.app.PendingIntent); method public static java.lang.String stateToString(int); field public static final int STATE_ACTIVE = 4; // 0x4 @@ -28600,35 +28596,6 @@ package android.telecomm { field public static final int STATE_RINGING = 2; // 0x2 } - public static abstract class Connection.VideoProvider { - ctor public Connection.VideoProvider(); - method public void changeCallDataUsage(int); - method public void changeCameraCapabilities(android.telecomm.CameraCapabilities); - method public void changePeerDimensions(int, int); - method public void handleCallSessionEvent(int); - method public abstract void onRequestCallDataUsage(); - method public abstract void onRequestCameraCapabilities(); - method public abstract void onSendSessionModifyRequest(android.telecomm.VideoProfile); - method public abstract void onSendSessionModifyResponse(android.telecomm.VideoProfile); - method public abstract void onSetCamera(java.lang.String); - method public abstract void onSetDeviceOrientation(int); - method public abstract void onSetDisplaySurface(android.view.Surface); - method public abstract void onSetPauseImage(java.lang.String); - method public abstract void onSetPreviewSurface(android.view.Surface); - method public abstract void onSetZoom(float); - method public void receiveSessionModifyRequest(android.telecomm.VideoProfile); - method public void receiveSessionModifyResponse(int, android.telecomm.VideoProfile, android.telecomm.VideoProfile); - field public static final int SESSION_EVENT_CAMERA_FAILURE = 5; // 0x5 - field public static final int SESSION_EVENT_CAMERA_READY = 6; // 0x6 - field public static final int SESSION_EVENT_RX_PAUSE = 1; // 0x1 - field public static final int SESSION_EVENT_RX_RESUME = 2; // 0x2 - field public static final int SESSION_EVENT_TX_START = 3; // 0x3 - field public static final int SESSION_EVENT_TX_STOP = 4; // 0x4 - field public static final int SESSION_MODIFY_REQUEST_FAIL = 2; // 0x2 - field public static final int SESSION_MODIFY_REQUEST_INVALID = 3; // 0x3 - field public static final int SESSION_MODIFY_REQUEST_SUCCESS = 1; // 0x1 - } - public final class ConnectionRequest implements android.os.Parcelable { ctor public ConnectionRequest(android.telecomm.PhoneAccountHandle, android.net.Uri, int, android.os.Bundle, int); method public int describeContents(); @@ -28636,7 +28603,6 @@ package android.telecomm { method public android.os.Bundle getExtras(); method public android.net.Uri getHandle(); method public int getHandlePresentation(); - method public int getVideoState(); method public void writeToParcel(android.os.Parcel, int); field public static final android.os.Parcelable.Creator CREATOR; } @@ -28748,7 +28714,6 @@ package android.telecomm { method public android.telecomm.RemoteConnection getParent(); method public int getState(); method public android.telecomm.StatusHints getStatusHints(); - method public int getVideoState(); method public void hold(); method public boolean isRequestingRingback(); method public void playDtmfTone(char); @@ -28776,7 +28741,6 @@ package android.telecomm { method public void onStartActivityFromInCall(android.telecomm.RemoteConnection, android.app.PendingIntent); method public void onStateChanged(android.telecomm.RemoteConnection, int); method public void onStatusHintsChanged(android.telecomm.RemoteConnection, android.telecomm.StatusHints); - method public void onVideoStateChanged(android.telecomm.RemoteConnection, int); } public abstract interface Response { @@ -28815,35 +28779,6 @@ package android.telecomm { field public static final java.lang.String EXTRA_CONNECTION_SERVICE = "android.telecomm.extra.CONNECTION_SERVICE"; field public static final java.lang.String EXTRA_PHONE_ACCOUNT_HANDLE = "android.intent.extra.PHONE_ACCOUNT_HANDLE"; field public static final java.lang.String EXTRA_START_CALL_WITH_SPEAKERPHONE = "android.intent.extra.START_CALL_WITH_SPEAKERPHONE"; - field public static final java.lang.String EXTRA_START_CALL_WITH_VIDEO_STATE = "android.intent.extra.START_CALL_WITH_VIDEO_STATE"; - } - - public class VideoProfile implements android.os.Parcelable { - ctor public VideoProfile(int); - ctor public VideoProfile(int, int); - method public int describeContents(); - method public int getQuality(); - method public int getVideoState(); - method public void writeToParcel(android.os.Parcel, int); - field public static final android.os.Parcelable.Creator CREATOR; - field public static final int QUALITY_DEFAULT = 4; // 0x4 - field public static final int QUALITY_HIGH = 1; // 0x1 - field public static final int QUALITY_LOW = 3; // 0x3 - field public static final int QUALITY_MEDIUM = 2; // 0x2 - } - - public static class VideoProfile.VideoState { - ctor public VideoProfile.VideoState(); - method public static boolean isAudioOnly(int); - method public static boolean isBidirectional(int); - method public static boolean isPaused(int); - method public static boolean isReceptionEnabled(int); - method public static boolean isTransmissionEnabled(int); - field public static final int AUDIO_ONLY = 0; // 0x0 - field public static final int BIDIRECTIONAL = 3; // 0x3 - field public static final int PAUSED = 4; // 0x4 - field public static final int RX_ENABLED = 2; // 0x2 - field public static final int TX_ENABLED = 1; // 0x1 } } diff --git a/telecomm/java/android/telecomm/Connection.java b/telecomm/java/android/telecomm/Connection.java index c307a25..a6856db 100644 --- a/telecomm/java/android/telecomm/Connection.java +++ b/telecomm/java/android/telecomm/Connection.java @@ -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; } diff --git a/telecomm/java/android/telecomm/ConnectionRequest.java b/telecomm/java/android/telecomm/ConnectionRequest.java index 5ea1d1a..b991af1 100644 --- a/telecomm/java/android/telecomm/ConnectionRequest.java +++ b/telecomm/java/android/telecomm/ConnectionRequest.java @@ -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; diff --git a/telecomm/java/android/telecomm/RemoteConnection.java b/telecomm/java/android/telecomm/RemoteConnection.java index 30cfdde..70db6f5 100644 --- a/telecomm/java/android/telecomm/RemoteConnection.java +++ b/telecomm/java/android/telecomm/RemoteConnection.java @@ -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; diff --git a/telecomm/java/android/telecomm/TelecommManager.java b/telecomm/java/android/telecomm/TelecommManager.java index 5192b0f..e59fea1 100644 --- a/telecomm/java/android/telecomm/TelecommManager.java +++ b/telecomm/java/android/telecomm/TelecommManager.java @@ -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"; diff --git a/telecomm/java/android/telecomm/VideoProfile.java b/telecomm/java/android/telecomm/VideoProfile.java index b147978..028d24e 100644 --- a/telecomm/java/android/telecomm/VideoProfile.java +++ b/telecomm/java/android/telecomm/VideoProfile.java @@ -21,6 +21,8 @@ import android.os.Parcelable; /** * Represents attributes of video calls. + * + * {@hide} */ public class VideoProfile implements Parcelable { /** |