From f015c0330f70b944eb91213e0908987e0f3ea03e Mon Sep 17 00:00:00 2001
From: Sylvain Berfini <sylvain.berfini@belledonne-communications.com>
Date: Thu, 28 Jul 2016 11:30:25 +0200
Subject: [PATCH] Do not call setName on the friend if there is no address

---
 src/org/linphone/LinphoneContact.java | 4 +++-
 src/org/linphone/LinphoneManager.java | 1 -
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/org/linphone/LinphoneContact.java b/src/org/linphone/LinphoneContact.java
index 1b350dd1a..a50ec6fb3 100644
--- a/src/org/linphone/LinphoneContact.java
+++ b/src/org/linphone/LinphoneContact.java
@@ -443,7 +443,9 @@ public class LinphoneContact implements Serializable, Comparable<LinphoneContact
 				friend.addPhoneNumber(noa.getValue());
 			}
 		}
-		friend.setName(fullName);
+		if (friend.getAddress() != null) {
+			friend.setName(fullName);
+		}
 		friend.done();
 		
 		if (friend.getAddress() != null) {
diff --git a/src/org/linphone/LinphoneManager.java b/src/org/linphone/LinphoneManager.java
index 8b2d2bb9d..6d6056045 100644
--- a/src/org/linphone/LinphoneManager.java
+++ b/src/org/linphone/LinphoneManager.java
@@ -1413,7 +1413,6 @@ public class LinphoneManager implements LinphoneCoreListener, LinphoneChatMessag
 		if (sExited || instance == null) {
 			// Can occur if the UI thread play a posted event but in the meantime the LinphoneManager was destroyed
 			// Ex: stop call and quickly terminate application.
-			Log.w("Trying to get linphone core while LinphoneManager already destroyed or not created");
 			return null;
 		}
 		return getLc();