From cce4aa09954239116f496e0f5d1ce1028f05e738 Mon Sep 17 00:00:00 2001
From: Guillaume Beraudo <guillaume.beraudo@belledonne-communications.com>
Date: Fri, 9 Dec 2011 14:51:08 +0100
Subject: [PATCH] Fix preview window on Nexus one.

---
 src/org/linphone/VideoCallActivity.java | 8 ++++----
 submodules/linphone                     | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/org/linphone/VideoCallActivity.java b/src/org/linphone/VideoCallActivity.java
index 0a08a6f7a..6aeb19295 100755
--- a/src/org/linphone/VideoCallActivity.java
+++ b/src/org/linphone/VideoCallActivity.java
@@ -99,7 +99,9 @@ public class VideoCallActivity extends Activity implements LinphoneOnCallStateCh
 			}
 			
 			public void onVideoPreviewSurfaceDestroyed(AndroidVideoWindowImpl vw) {
-				
+				// Remove references kept in jni code and restart camera
+				// LinphoneManager.getLc().setPreviewWindow(null);
+				// Commented to remove flicker.
 			}
 		});
 		
@@ -290,9 +292,7 @@ public class VideoCallActivity extends Activity implements LinphoneOnCallStateCh
 			 */
 			LinphoneManager.getLc().setVideoWindow(null);
 		}
-		
-		LinphoneManager.getLc().setPreviewWindow(null);
-		
+
 		if (mCallQualityUpdater!=null){
 			refreshHandler.removeCallbacks(mCallQualityUpdater);
 			mCallQualityUpdater=null;
diff --git a/submodules/linphone b/submodules/linphone
index ad8a8bbbb..75e7426eb 160000
--- a/submodules/linphone
+++ b/submodules/linphone
@@ -1 +1 @@
-Subproject commit ad8a8bbbb3fe7189111c38eefe1320ae21a64f02
+Subproject commit 75e7426eb68e6fdbaae229e05fe11398172fec7e