From 8b719d2011926e5022df9153b45e849461dab19f Mon Sep 17 00:00:00 2001
From: Erwan Croze <erwan.croze@belledonne-communications.com>
Date: Thu, 18 May 2017 15:59:41 +0200
Subject: [PATCH] Fix destroy of ContactsManager in LinphoneManager

---
 src/android/org/linphone/LinphoneManager.java | 8 ++++----
 src/android/org/linphone/LinphoneService.java | 1 -
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/src/android/org/linphone/LinphoneManager.java b/src/android/org/linphone/LinphoneManager.java
index 508bedc2b..93133bf27 100644
--- a/src/android/org/linphone/LinphoneManager.java
+++ b/src/android/org/linphone/LinphoneManager.java
@@ -1098,13 +1098,13 @@ public class LinphoneManager implements LinphoneCoreListener, LinphoneChatMessag
 	}
 
 	public static void ContactsManagerDestroy() {
-		if (ContactsManager.getInstance() != null)
-			ContactsManager.getInstance().destroy();
+		if (LinphoneManager.instance != null && LinphoneManager.instance.mServiceContext != null)
+			LinphoneManager.instance.mServiceContext.getContentResolver().unregisterContentObserver(ContactsManager.getInstance());
+		ContactsManager.getInstance().destroy();
 	}
 
 	public static void BluetoothManagerDestroy() {
-		if (BluetoothManager.getInstance() != null)
-			BluetoothManager.getInstance().destroy();
+		BluetoothManager.getInstance().destroy();
 	}
 
 	public static synchronized void destroy() {
diff --git a/src/android/org/linphone/LinphoneService.java b/src/android/org/linphone/LinphoneService.java
index eed0885c3..a34181f71 100644
--- a/src/android/org/linphone/LinphoneService.java
+++ b/src/android/org/linphone/LinphoneService.java
@@ -799,7 +799,6 @@ public final class LinphoneService extends Service {
 		}
 
 		instance = null;
-		getContentResolver().unregisterContentObserver(ContactsManager.getInstance());
 		LinphoneManager.destroy();
 
 	    // Make sure our notification is gone.