From 7583ceb3b9f99f9af68d44f83daeb6dfbfc45811 Mon Sep 17 00:00:00 2001
From: Matthieu Baglin <matthieu.baglin@intel.com>
Date: Fri, 12 Dec 2014 16:27:21 +0100
Subject: Set the camera to null when preview surface is destroyed

When the video call is disconnected, the camera would still
be opened without this fix.

Signed-off-by: Matthieu Baglin <matthieu.baglin@intel.com>
Change-Id: Ie69fb87412c53e4c6072d998d3e3b067c4c8ba0f
---
 InCallUI/src/com/android/incallui/VideoCallPresenter.java | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/InCallUI/src/com/android/incallui/VideoCallPresenter.java b/InCallUI/src/com/android/incallui/VideoCallPresenter.java
index ed0024126..c566264c1 100644
--- a/InCallUI/src/com/android/incallui/VideoCallPresenter.java
+++ b/InCallUI/src/com/android/incallui/VideoCallPresenter.java
@@ -256,6 +256,8 @@ public class VideoCallPresenter extends Presenter<VideoCallPresenter.VideoCallUi
             mVideoCall.setDisplaySurface(null);
         } else if (surface == VideoCallFragment.SURFACE_PREVIEW) {
             mVideoCall.setPreviewSurface(null);
+            // Also disable camera as preview is closed
+            mVideoCall.setCamera(null);
         }
     }
 
-- 
cgit v1.2.3