diff options
| author | Tyler Gunn <tgunn@google.com> | 2014-08-10 02:04:35 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-08-09 00:51:24 +0000 |
| commit | ad4d6914883fae5deaee693e52b68cfaa79097d0 (patch) | |
| tree | a40f8e31bc9530d725753049bba64186116af6a3 | |
| parent | 5dcd1e938b790614cc9c397dcfab35344f3aa98e (diff) | |
| parent | 4ed232b7beb54b1df58eeee47846a8f86741572d (diff) | |
Merge "VT preview camera setup. (2/2)" into lmp-dev
| -rw-r--r-- | InCallUI/src/com/android/incallui/CallButtonPresenter.java | 1 | ||||
| -rw-r--r-- | InCallUI/src/com/android/incallui/VideoCallPresenter.java | 3 |
2 files changed, 3 insertions, 1 deletions
diff --git a/InCallUI/src/com/android/incallui/CallButtonPresenter.java b/InCallUI/src/com/android/incallui/CallButtonPresenter.java index 15a64b63f..878a4d9a1 100644 --- a/InCallUI/src/com/android/incallui/CallButtonPresenter.java +++ b/InCallUI/src/com/android/incallui/CallButtonPresenter.java @@ -254,6 +254,7 @@ public class CallButtonPresenter extends Presenter<CallButtonPresenter.CallButto String cameraId = mInCallCameraManager.getActiveCameraId(); if (cameraId != null) { videoCall.setCamera(cameraId); + videoCall.requestCameraCapabilities(); } getUi().setSwitchCameraButton(!useFrontFacingCamera); } diff --git a/InCallUI/src/com/android/incallui/VideoCallPresenter.java b/InCallUI/src/com/android/incallui/VideoCallPresenter.java index 77aa4ac0c..077aa25ee 100644 --- a/InCallUI/src/com/android/incallui/VideoCallPresenter.java +++ b/InCallUI/src/com/android/incallui/VideoCallPresenter.java @@ -397,7 +397,7 @@ public class VideoCallPresenter extends Presenter<VideoCallPresenter.VideoCallUi ui.showVideoUi(true); InCallPresenter.getInstance().setInCallAllowsOrientationChange(true); - // Communicate the current camera to telephony; expect to get call-back with camera + // Communicate the current camera to telephony and make a request for the camera // capabilities. if (mVideoCall != null) { // Do not reset the surfaces if we just restarted the activity due to an orientation @@ -408,6 +408,7 @@ public class VideoCallPresenter extends Presenter<VideoCallPresenter.VideoCallUi mPreviewSurfaceState = PreviewSurfaceState.CAMERA_SET; mVideoCall.setCamera(mInCallCameraManager.getActiveCameraId()); + mVideoCall.requestCameraCapabilities(); if (ui.isDisplayVideoSurfaceCreated()) { mVideoCall.setDisplaySurface(ui.getDisplayVideoSurface()); |