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

am cca2ff3a: am a75300ec: am d9593758: Merge "Adding camera failure/ready session events." into lmp-dev

Browse Source 
* commit 'cca2ff3ace0ecff9d108b82aa5282fae41fec3a1':
  Adding camera failure/ready session events.
This commit is contained in:
Tyler Gunn
2014-08-10 09:04:02 +00:00
committed by Android Git Automerger
parent 192800ce71 854369f504
commit 0582d3da2b
2 changed files with 20 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
api/current.txt
View File

@@ -28907,6 +28907,8 @@ package android.telecomm {
method public abstract void setPreviewSurface(android.view.Surface);
method public abstract void setVideoCallListener(android.telecomm.InCallService.VideoCall.Listener);
method public abstract void setZoom(float);
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

21
telecomm/java/android/telecomm/InCallService.java
View File

@@ -207,11 +207,24 @@ public abstract class InCallService extends Service {
public static final int SESSION_EVENT_TX_START = 3;
/**
* Video transmission has stopped. This occur after a negotiated stop of video transmission when
* the underlying protocol has actually stopped transmitting video to the remote party.
* Video transmission has stopped. This occurs after a negotiated stop of video transmission
* when the underlying protocol has actually stopped transmitting video to the remote party.
*/
public static final int SESSION_EVENT_TX_STOP = 4;
/**
* A camera failure has occurred for the selected camera. The In-Call UI can use this as a
* cue to inform the user the camera is not available.
*/
public static final int SESSION_EVENT_CAMERA_FAILURE = 5;
/**
* Issued after {@code SESSION_EVENT_CAMERA_FAILURE} when the camera is once again ready for
* operation. The In-Call UI can use this as a cue to inform the user that the camera has
* become available again.
*/
public static final int SESSION_EVENT_CAMERA_READY = 6;
/**
* Session modify request was successful.
*/
@@ -359,7 +372,9 @@ public abstract class InCallService extends Service {
* Valid values are: {@link VideoCall#SESSION_EVENT_RX_PAUSE},
* {@link VideoCall#SESSION_EVENT_RX_RESUME},
* {@link VideoCall#SESSION_EVENT_TX_START},
* {@link VideoCall#SESSION_EVENT_TX_STOP}
* {@link VideoCall#SESSION_EVENT_TX_STOP},
* {@link VideoCall#SESSION_EVENT_CAMERA_FAILURE},
* {@link VideoCall#SESSION_EVENT_CAMERA_READY}
*
* @param event The event.
*/