diff options
| author | Suresh Koleti <skolet@codeaurora.org> | 2015-11-20 18:30:22 +0530 |
|---|---|---|
| committer | Steve Kondik <steve@cyngn.com> | 2016-05-20 23:09:14 -0700 |
| commit | 2b1737df774758b7f9deee9e3a6e4383ed475cd2 (patch) | |
| tree | 3fccb8ad512b0cdd113824de7ef1c8da19ae7488 | |
| parent | d7057aba433e38685948bccde28527c993507b09 (diff) | |
| download | packages_apps_InCallUI-2b1737df774758b7f9deee9e3a6e4383ed475cd2.tar.gz packages_apps_InCallUI-2b1737df774758b7f9deee9e3a6e4383ed475cd2.tar.bz2 packages_apps_InCallUI-2b1737df774758b7f9deee9e3a6e4383ed475cd2.zip | |
IMS-VT: Set preview surface only if camera is opened
Unable to open camera once user went to background and foreground
if PARAM_READY is received when activity is in background due to
preview surface is set as part of PARAM_READY.
If camera is not opened don't set the preview surface.
Flow of setting preview surface will be openCamera->
RequestCameraCapablities->surface set.
Change-Id: I5f5a37ec2f97a14f449dc757f8806b24a9144396
CRs-Fixed: 939557
| -rw-r--r-- | src/com/android/incallui/VideoCallPresenter.java | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/src/com/android/incallui/VideoCallPresenter.java b/src/com/android/incallui/VideoCallPresenter.java index a56f6041..a36fc019 100644 --- a/src/com/android/incallui/VideoCallPresenter.java +++ b/src/com/android/incallui/VideoCallPresenter.java @@ -979,9 +979,15 @@ public class VideoCallPresenter extends Presenter<VideoCallPresenter.VideoCallUi return; } - mPreviewSurfaceState = PreviewSurfaceState.CAPABILITIES_RECEIVED; changePreviewDimensions(width, height); + if (mPreviewSurfaceState == PreviewSurfaceState.NONE) { + Log.w(this, "Received camera capabilities when camera is closed"); + return; + } + + mPreviewSurfaceState = PreviewSurfaceState.CAPABILITIES_RECEIVED; + // Check if the preview surface is ready yet; if it is, set it on the {@code VideoCall}. // If it not yet ready, it will be set when when creation completes. if (ui.isPreviewVideoSurfaceCreated()) { |