From 233b19798628a5300d3973d53cbd4b26a978decb Mon Sep 17 00:00:00 2001
From: Jehan Monnier <jehan.monnier@linphone.org>
Date: Fri, 5 Apr 2013 14:51:44 +0200
Subject: [PATCH] fix bluetooth lock

---
 src/org/linphone/LinphoneActivity.java | 16 +++++++++++++++-
 src/org/linphone/LinphoneManager.java  |  7 +++----
 submodules/linphone                    |  2 +-
 3 files changed, 19 insertions(+), 6 deletions(-)

diff --git a/src/org/linphone/LinphoneActivity.java b/src/org/linphone/LinphoneActivity.java
index db4ab909f..3ef5eb9e9 100644
--- a/src/org/linphone/LinphoneActivity.java
+++ b/src/org/linphone/LinphoneActivity.java
@@ -1429,10 +1429,24 @@ public class LinphoneActivity extends FragmentActivity implements
 			return view;
 		}
 	}
+
+	@Override
+	public void onUserInteraction() {
+		// TODO Auto-generated method stub
+		super.onUserInteraction();
+		Log.i("User interaction started");
+	}
+
+	@Override
+	protected void onUserLeaveHint() {
+		// TODO Auto-generated method stub
+		super.onUserLeaveHint();
+		Log.i("User interaction stopped");
+	}
 }
 
 interface ContactPicked {
 	void setAddresGoToDialerAndCall(String number, String name, Uri photo);
 
 	void goToDialer();
-}
\ No newline at end of file
+}
diff --git a/src/org/linphone/LinphoneManager.java b/src/org/linphone/LinphoneManager.java
index 3a2b4d868..543b60dc0 100644
--- a/src/org/linphone/LinphoneManager.java
+++ b/src/org/linphone/LinphoneManager.java
@@ -571,9 +571,9 @@ public final class LinphoneManager implements LinphoneCoreListener {
 				Log.w("no config ready yet");
 			}
 			boolean routeToBT = mServiceContext.getResources().getBoolean(R.bool.route_audio_to_bluetooth_if_available);
-	        if (routeToBT) {
-	        	startBluetooth();
-	        }
+	        	if (routeToBT) {
+	        		startBluetooth();
+	        	}
 	        
 			TimerTask lTask = new TimerTask() {
 				@Override
@@ -588,7 +588,6 @@ public final class LinphoneManager implements LinphoneCoreListener {
 	        lFilter.addAction(Intent.ACTION_SCREEN_OFF);
 	        mServiceContext.registerReceiver(mKeepAliveReceiver, lFilter);
 			
-	        startBluetooth();
 	        resetCameraFromPreferences();
 		}
 		catch (Exception e) {
diff --git a/submodules/linphone b/submodules/linphone
index 0f9f315cb..4da21ea4b 160000
--- a/submodules/linphone
+++ b/submodules/linphone
@@ -1 +1 @@
-Subproject commit 0f9f315cbb1ff4af29554cff3c9a20ac99a2f0ba
+Subproject commit 4da21ea4b0e8d1cc4a1005ed446744ead533bd4c