From fb823df2088ae0f464d8d563c342d566dc5ead34 Mon Sep 17 00:00:00 2001 From: Simon Morlat Date: Fri, 23 Sep 2011 21:37:51 +0200 Subject: [PATCH] fix preview that disapear after rotation --- src/org/linphone/VideoCallActivity.java | 6 ++++-- submodules/linphone | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/org/linphone/VideoCallActivity.java b/src/org/linphone/VideoCallActivity.java index 96f1fcbb5..34e387f78 100644 --- a/src/org/linphone/VideoCallActivity.java +++ b/src/org/linphone/VideoCallActivity.java @@ -227,6 +227,9 @@ public class VideoCallActivity extends SoftVolumeActivity { @Override protected void onPause() { Log.d("onPause VideoCallActivity"); + LinphoneManager.getLc().setVideoWindow(null); + LinphoneManager.getLc().setPreviewWindow(null); + if (!isFinishing() && LinphoneManager.getLc().isIncall()) { // we're getting paused for real if (getChangingConfigurations() == 0) { @@ -236,8 +239,7 @@ public class VideoCallActivity extends SoftVolumeActivity { LinphoneManager.getLc().updateCall(LinphoneManager.getLc().getCurrentCall(), null); } } - LinphoneManager.getLc().setVideoWindow(null); - LinphoneManager.getLc().setPreviewWindow(null); + if (mWakeLock.isHeld()) mWakeLock.release(); super.onPause(); diff --git a/submodules/linphone b/submodules/linphone index 33c884f49..5fc7a0685 160000 --- a/submodules/linphone +++ b/submodules/linphone @@ -1 +1 @@ -Subproject commit 33c884f493d473a1373a7d219ecfd07db60e50cc +Subproject commit 5fc7a0685ba488accd2eca977459202f522f806f