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

am 3a0e32d8: am 9fc7bcfc: am 0eb2ba88: Merge "Hiding Video telephony related APIs." into lmp-dev

Browse Source 
* commit '3a0e32d891d3f40affce2d0b2750fa57254b4792':
  Hiding Video telephony related APIs.
This commit is contained in:
Tyler Gunn
2014-08-22 17:39:32 +00:00
committed by Android Git Automerger
parent e2cd6bd66e 29349315fe
commit f9075489b7
6 changed files with 11 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files

65
api/current.txt
View File

@@ -28620,8 +28620,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);
@@ -28653,8 +28651,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
@@ -28666,35 +28662,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();
@@ -28702,7 +28669,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;
}
@@ -28814,7 +28780,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);
@@ -28842,7 +28807,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 {
@@ -28881,35 +28845,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
}
}

5
telecomm/java/android/telecomm/Connection.java
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;
}

1
telecomm/java/android/telecomm/ConnectionRequest.java
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;

2
telecomm/java/android/telecomm/RemoteConnection.java
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;

1
telecomm/java/android/telecomm/TelecommManager.java
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";

2
telecomm/java/android/telecomm/VideoProfile.java
View File

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