diff --git a/app/src/main/java/org/linphone/LinphoneActivity.java b/app/src/main/java/org/linphone/LinphoneActivity.java
index d0ecd8d90..e926070eb 100644
--- a/app/src/main/java/org/linphone/LinphoneActivity.java
+++ b/app/src/main/java/org/linphone/LinphoneActivity.java
@@ -101,6 +101,7 @@ import org.linphone.core.Factory;
 import org.linphone.core.ProxyConfig;
 import org.linphone.core.Reason;
 import org.linphone.core.RegistrationState;
+import org.linphone.core.tools.Log;
 import org.linphone.fragments.AboutFragment;
 import org.linphone.fragments.DialerFragment;
 import org.linphone.fragments.EmptyFragment;
@@ -108,7 +109,6 @@ import org.linphone.fragments.FragmentsAvailable;
 import org.linphone.fragments.StatusFragment;
 import org.linphone.history.HistoryDetailFragment;
 import org.linphone.history.HistoryFragment;
-import org.linphone.mediastream.Log;
 import org.linphone.purchase.InAppPurchaseActivity;
 import org.linphone.recording.RecordingsFragment;
 import org.linphone.settings.AccountPreferencesFragment;
diff --git a/app/src/main/java/org/linphone/LinphoneManager.java b/app/src/main/java/org/linphone/LinphoneManager.java
index 8a5c18adb..f66b6861a 100644
--- a/app/src/main/java/org/linphone/LinphoneManager.java
+++ b/app/src/main/java/org/linphone/LinphoneManager.java
@@ -116,9 +116,9 @@ import org.linphone.core.Tunnel;
 import org.linphone.core.TunnelConfig;
 import org.linphone.core.VersionUpdateCheckResult;
 import org.linphone.core.tools.H264Helper;
+import org.linphone.core.tools.Log;
 import org.linphone.core.tools.OpenH264DownloadHelper;
 import org.linphone.core.tools.OpenH264DownloadHelperListener;
-import org.linphone.mediastream.Log;
 import org.linphone.mediastream.Version;
 import org.linphone.mediastream.video.capture.hwconf.AndroidCameraConfiguration;
 import org.linphone.mediastream.video.capture.hwconf.AndroidCameraConfiguration.AndroidCamera;
diff --git a/app/src/main/java/org/linphone/LinphoneService.java b/app/src/main/java/org/linphone/LinphoneService.java
index 46e983bbf..16ec31f30 100644
--- a/app/src/main/java/org/linphone/LinphoneService.java
+++ b/app/src/main/java/org/linphone/LinphoneService.java
@@ -48,7 +48,7 @@ import org.linphone.core.LoggingService;
 import org.linphone.core.LoggingServiceListener;
 import org.linphone.core.ProxyConfig;
 import org.linphone.core.RegistrationState;
-import org.linphone.mediastream.Log;
+import org.linphone.core.tools.Log;
 import org.linphone.mediastream.Version;
 import org.linphone.notifications.NotificationsManager;
 import org.linphone.receivers.BluetoothManager;
@@ -396,7 +396,7 @@ public final class LinphoneService extends Service {
                 lc.terminateAllCalls();
             }
 
-            Log.d("[Service] Task removed, stop service");
+            Log.i("[Service] Task removed, stop service");
 
             // If push is enabled, don't unregister account, otherwise do unregister
             if (LinphonePreferences.instance().isPushNotificationEnabled()) {
diff --git a/app/src/main/java/org/linphone/assistant/AssistantActivity.java b/app/src/main/java/org/linphone/assistant/AssistantActivity.java
index a04088191..00700191a 100644
--- a/app/src/main/java/org/linphone/assistant/AssistantActivity.java
+++ b/app/src/main/java/org/linphone/assistant/AssistantActivity.java
@@ -73,9 +73,9 @@ import org.linphone.core.Factory;
 import org.linphone.core.ProxyConfig;
 import org.linphone.core.RegistrationState;
 import org.linphone.core.TransportType;
+import org.linphone.core.tools.Log;
 import org.linphone.core.tools.OpenH264DownloadHelper;
 import org.linphone.fragments.StatusFragment;
-import org.linphone.mediastream.Log;
 import org.linphone.mediastream.Version;
 import org.linphone.settings.LinphonePreferences;
 import org.linphone.settings.LinphonePreferences.AccountBuilder;
diff --git a/app/src/main/java/org/linphone/assistant/EchoCancellerCalibrationFragment.java b/app/src/main/java/org/linphone/assistant/EchoCancellerCalibrationFragment.java
index 9b4960503..bd463dccc 100644
--- a/app/src/main/java/org/linphone/assistant/EchoCancellerCalibrationFragment.java
+++ b/app/src/main/java/org/linphone/assistant/EchoCancellerCalibrationFragment.java
@@ -35,7 +35,7 @@ import org.linphone.core.XmlRpcArgType;
 import org.linphone.core.XmlRpcRequest;
 import org.linphone.core.XmlRpcRequestListener;
 import org.linphone.core.XmlRpcSession;
-import org.linphone.mediastream.Log;
+import org.linphone.core.tools.Log;
 import org.linphone.settings.LinphonePreferences;
 
 public class EchoCancellerCalibrationFragment extends Fragment implements XmlRpcRequestListener {
diff --git a/app/src/main/java/org/linphone/assistant/RemoteProvisioningActivity.java b/app/src/main/java/org/linphone/assistant/RemoteProvisioningActivity.java
index 844fa9c2b..3db01412a 100644
--- a/app/src/main/java/org/linphone/assistant/RemoteProvisioningActivity.java
+++ b/app/src/main/java/org/linphone/assistant/RemoteProvisioningActivity.java
@@ -37,7 +37,7 @@ import org.linphone.R;
 import org.linphone.core.ConfiguringState;
 import org.linphone.core.Core;
 import org.linphone.core.CoreListenerStub;
-import org.linphone.mediastream.Log;
+import org.linphone.core.tools.Log;
 import org.linphone.settings.LinphonePreferences;
 
 public class RemoteProvisioningActivity extends Activity {
diff --git a/app/src/main/java/org/linphone/call/CallActivity.java b/app/src/main/java/org/linphone/call/CallActivity.java
index 9c8eb45f8..3fd7a196e 100644
--- a/app/src/main/java/org/linphone/call/CallActivity.java
+++ b/app/src/main/java/org/linphone/call/CallActivity.java
@@ -82,8 +82,8 @@ import org.linphone.core.MediaEncryption;
 import org.linphone.core.PayloadType;
 import org.linphone.core.Player;
 import org.linphone.core.StreamType;
+import org.linphone.core.tools.Log;
 import org.linphone.fragments.StatusFragment;
-import org.linphone.mediastream.Log;
 import org.linphone.mediastream.video.capture.hwconf.AndroidCameraConfiguration;
 import org.linphone.receivers.BluetoothManager;
 import org.linphone.settings.LinphonePreferences;
diff --git a/app/src/main/java/org/linphone/call/CallIncomingActivity.java b/app/src/main/java/org/linphone/call/CallIncomingActivity.java
index d9592c10b..a34f1b4cb 100644
--- a/app/src/main/java/org/linphone/call/CallIncomingActivity.java
+++ b/app/src/main/java/org/linphone/call/CallIncomingActivity.java
@@ -43,7 +43,7 @@ import org.linphone.core.Call;
 import org.linphone.core.Call.State;
 import org.linphone.core.Core;
 import org.linphone.core.CoreListenerStub;
-import org.linphone.mediastream.Log;
+import org.linphone.core.tools.Log;
 import org.linphone.settings.LinphonePreferences;
 import org.linphone.utils.ImageUtils;
 import org.linphone.utils.LinphoneGenericActivity;
diff --git a/app/src/main/java/org/linphone/call/CallManager.java b/app/src/main/java/org/linphone/call/CallManager.java
index 6d078cebf..3b4b532c4 100644
--- a/app/src/main/java/org/linphone/call/CallManager.java
+++ b/app/src/main/java/org/linphone/call/CallManager.java
@@ -25,7 +25,7 @@ import org.linphone.core.Address;
 import org.linphone.core.Call;
 import org.linphone.core.CallParams;
 import org.linphone.core.Core;
-import org.linphone.mediastream.Log;
+import org.linphone.core.tools.Log;
 import org.linphone.utils.FileUtils;
 import org.linphone.utils.LinphoneUtils;
 
diff --git a/app/src/main/java/org/linphone/call/CallOutgoingActivity.java b/app/src/main/java/org/linphone/call/CallOutgoingActivity.java
index 63dcf5024..834a71847 100644
--- a/app/src/main/java/org/linphone/call/CallOutgoingActivity.java
+++ b/app/src/main/java/org/linphone/call/CallOutgoingActivity.java
@@ -46,7 +46,7 @@ import org.linphone.core.Call.State;
 import org.linphone.core.Core;
 import org.linphone.core.CoreListenerStub;
 import org.linphone.core.Reason;
-import org.linphone.mediastream.Log;
+import org.linphone.core.tools.Log;
 import org.linphone.settings.LinphonePreferences;
 import org.linphone.utils.ImageUtils;
 import org.linphone.utils.LinphoneGenericActivity;
diff --git a/app/src/main/java/org/linphone/call/CallVideoFragment.java b/app/src/main/java/org/linphone/call/CallVideoFragment.java
index 2554ebf33..563c4b683 100644
--- a/app/src/main/java/org/linphone/call/CallVideoFragment.java
+++ b/app/src/main/java/org/linphone/call/CallVideoFragment.java
@@ -40,7 +40,7 @@ import org.linphone.compatibility.CompatibilityScaleGestureListener;
 import org.linphone.core.Call;
 import org.linphone.core.Core;
 import org.linphone.core.VideoDefinition;
-import org.linphone.mediastream.Log;
+import org.linphone.core.tools.Log;
 import org.linphone.settings.LinphonePreferences;
 import org.linphone.utils.LinphoneUtils;
 
diff --git a/app/src/main/java/org/linphone/chat/ChatMessageViewHolder.java b/app/src/main/java/org/linphone/chat/ChatMessageViewHolder.java
index 68675254d..4c1e94e87 100644
--- a/app/src/main/java/org/linphone/chat/ChatMessageViewHolder.java
+++ b/app/src/main/java/org/linphone/chat/ChatMessageViewHolder.java
@@ -53,7 +53,7 @@ import org.linphone.contacts.LinphoneContact;
 import org.linphone.core.Address;
 import org.linphone.core.ChatMessage;
 import org.linphone.core.Content;
-import org.linphone.mediastream.Log;
+import org.linphone.core.tools.Log;
 import org.linphone.utils.FileUtils;
 import org.linphone.utils.ImageUtils;
 import org.linphone.utils.LinphoneUtils;
diff --git a/app/src/main/java/org/linphone/chat/ChatMessagesFragment.java b/app/src/main/java/org/linphone/chat/ChatMessagesFragment.java
index b0e36cc18..193dbf48f 100644
--- a/app/src/main/java/org/linphone/chat/ChatMessagesFragment.java
+++ b/app/src/main/java/org/linphone/chat/ChatMessagesFragment.java
@@ -84,7 +84,7 @@ import org.linphone.core.LimeState;
 import org.linphone.core.Participant;
 import org.linphone.core.ParticipantDevice;
 import org.linphone.core.Reason;
-import org.linphone.mediastream.Log;
+import org.linphone.core.tools.Log;
 import org.linphone.settings.LinphonePreferences;
 import org.linphone.utils.FileUtils;
 import org.linphone.utils.ImageUtils;
diff --git a/app/src/main/java/org/linphone/chat/ChatMessagesOldAdapter.java b/app/src/main/java/org/linphone/chat/ChatMessagesOldAdapter.java
index 547a8ac4e..0e7d2f32e 100644
--- a/app/src/main/java/org/linphone/chat/ChatMessagesOldAdapter.java
+++ b/app/src/main/java/org/linphone/chat/ChatMessagesOldAdapter.java
@@ -55,7 +55,7 @@ import org.linphone.core.ChatMessageListenerStub;
 import org.linphone.core.Content;
 import org.linphone.core.EventLog;
 import org.linphone.core.LimeState;
-import org.linphone.mediastream.Log;
+import org.linphone.core.tools.Log;
 import org.linphone.utils.FileUtils;
 import org.linphone.utils.LinphoneUtils;
 import org.linphone.utils.SelectableAdapter;
diff --git a/app/src/main/java/org/linphone/chat/ChatRoomCreationFragment.java b/app/src/main/java/org/linphone/chat/ChatRoomCreationFragment.java
index f640afcf6..34e9f0fc8 100644
--- a/app/src/main/java/org/linphone/chat/ChatRoomCreationFragment.java
+++ b/app/src/main/java/org/linphone/chat/ChatRoomCreationFragment.java
@@ -56,8 +56,8 @@ import org.linphone.core.Core;
 import org.linphone.core.FriendCapability;
 import org.linphone.core.ProxyConfig;
 import org.linphone.core.SearchResult;
+import org.linphone.core.tools.Log;
 import org.linphone.fragments.FragmentsAvailable;
-import org.linphone.mediastream.Log;
 import org.linphone.settings.LinphonePreferences;
 import org.linphone.views.ContactSelectView;
 
diff --git a/app/src/main/java/org/linphone/chat/ChatRoomsFragment.java b/app/src/main/java/org/linphone/chat/ChatRoomsFragment.java
index 3debf2d7e..04b414f6b 100644
--- a/app/src/main/java/org/linphone/chat/ChatRoomsFragment.java
+++ b/app/src/main/java/org/linphone/chat/ChatRoomsFragment.java
@@ -50,8 +50,8 @@ import org.linphone.core.Core;
 import org.linphone.core.CoreListenerStub;
 import org.linphone.core.EventLog;
 import org.linphone.core.ProxyConfig;
+import org.linphone.core.tools.Log;
 import org.linphone.fragments.FragmentsAvailable;
-import org.linphone.mediastream.Log;
 import org.linphone.utils.SelectableHelper;
 
 public class ChatRoomsFragment extends Fragment
diff --git a/app/src/main/java/org/linphone/chat/GroupInfoFragment.java b/app/src/main/java/org/linphone/chat/GroupInfoFragment.java
index 018fb02f3..3521e5c92 100644
--- a/app/src/main/java/org/linphone/chat/GroupInfoFragment.java
+++ b/app/src/main/java/org/linphone/chat/GroupInfoFragment.java
@@ -53,8 +53,8 @@ import org.linphone.core.ChatRoomListener;
 import org.linphone.core.ChatRoomListenerStub;
 import org.linphone.core.EventLog;
 import org.linphone.core.Participant;
+import org.linphone.core.tools.Log;
 import org.linphone.fragments.FragmentsAvailable;
-import org.linphone.mediastream.Log;
 import org.linphone.utils.LinphoneUtils;
 
 public class GroupInfoFragment extends Fragment implements ChatRoomListener {
diff --git a/app/src/main/java/org/linphone/contacts/AndroidContact.java b/app/src/main/java/org/linphone/contacts/AndroidContact.java
index f85042b99..09f855744 100644
--- a/app/src/main/java/org/linphone/contacts/AndroidContact.java
+++ b/app/src/main/java/org/linphone/contacts/AndroidContact.java
@@ -35,7 +35,7 @@ import java.util.ArrayList;
 import org.linphone.LinphoneManager;
 import org.linphone.LinphoneService;
 import org.linphone.R;
-import org.linphone.mediastream.Log;
+import org.linphone.core.tools.Log;
 
 class AndroidContact implements Serializable {
     protected String mAndroidId, mAndroidRawId, mAndroidLookupKey;
diff --git a/app/src/main/java/org/linphone/contacts/AsyncContactsLoader.java b/app/src/main/java/org/linphone/contacts/AsyncContactsLoader.java
index 1f8edd745..4c971c8e4 100644
--- a/app/src/main/java/org/linphone/contacts/AsyncContactsLoader.java
+++ b/app/src/main/java/org/linphone/contacts/AsyncContactsLoader.java
@@ -36,7 +36,7 @@ import org.linphone.core.Friend;
 import org.linphone.core.FriendList;
 import org.linphone.core.PresenceBasicStatus;
 import org.linphone.core.PresenceModel;
-import org.linphone.mediastream.Log;
+import org.linphone.core.tools.Log;
 import org.linphone.settings.LinphonePreferences;
 import org.linphone.utils.LinphoneUtils;
 
diff --git a/app/src/main/java/org/linphone/contacts/ContactDetailsFragment.java b/app/src/main/java/org/linphone/contacts/ContactDetailsFragment.java
index 145f28530..706230849 100644
--- a/app/src/main/java/org/linphone/contacts/ContactDetailsFragment.java
+++ b/app/src/main/java/org/linphone/contacts/ContactDetailsFragment.java
@@ -46,8 +46,8 @@ import org.linphone.core.FriendCapability;
 import org.linphone.core.PresenceBasicStatus;
 import org.linphone.core.PresenceModel;
 import org.linphone.core.ProxyConfig;
+import org.linphone.core.tools.Log;
 import org.linphone.fragments.FragmentsAvailable;
-import org.linphone.mediastream.Log;
 import org.linphone.settings.LinphonePreferences;
 import org.linphone.utils.ImageUtils;
 import org.linphone.utils.LinphoneUtils;
diff --git a/app/src/main/java/org/linphone/contacts/ContactEditorFragment.java b/app/src/main/java/org/linphone/contacts/ContactEditorFragment.java
index b66f60b35..354dbdea1 100644
--- a/app/src/main/java/org/linphone/contacts/ContactEditorFragment.java
+++ b/app/src/main/java/org/linphone/contacts/ContactEditorFragment.java
@@ -55,7 +55,7 @@ import java.util.List;
 import org.linphone.LinphoneActivity;
 import org.linphone.LinphoneManager;
 import org.linphone.R;
-import org.linphone.mediastream.Log;
+import org.linphone.core.tools.Log;
 import org.linphone.mediastream.Version;
 import org.linphone.utils.FileUtils;
 import org.linphone.utils.ImageUtils;
diff --git a/app/src/main/java/org/linphone/contacts/ContactsManager.java b/app/src/main/java/org/linphone/contacts/ContactsManager.java
index 4686e0015..382fccdec 100644
--- a/app/src/main/java/org/linphone/contacts/ContactsManager.java
+++ b/app/src/main/java/org/linphone/contacts/ContactsManager.java
@@ -54,7 +54,7 @@ import org.linphone.core.FriendList;
 import org.linphone.core.FriendListListener;
 import org.linphone.core.MagicSearch;
 import org.linphone.core.ProxyConfig;
-import org.linphone.mediastream.Log;
+import org.linphone.core.tools.Log;
 import org.linphone.settings.LinphonePreferences;
 
 public class ContactsManager extends ContentObserver implements FriendListListener {
diff --git a/app/src/main/java/org/linphone/firebase/FirebaseMessaging.java b/app/src/main/java/org/linphone/firebase/FirebaseMessaging.java
index 98a9eb30b..fbe1dfe50 100644
--- a/app/src/main/java/org/linphone/firebase/FirebaseMessaging.java
+++ b/app/src/main/java/org/linphone/firebase/FirebaseMessaging.java
@@ -26,7 +26,7 @@ import com.google.firebase.messaging.FirebaseMessagingService;
 import com.google.firebase.messaging.RemoteMessage;
 import org.linphone.LinphoneManager;
 import org.linphone.LinphoneService;
-import org.linphone.mediastream.Log;
+import org.linphone.core.tools.Log;
 import org.linphone.settings.LinphonePreferences;
 import org.linphone.utils.LinphoneUtils;
 
diff --git a/app/src/main/java/org/linphone/fragments/AboutFragment.java b/app/src/main/java/org/linphone/fragments/AboutFragment.java
index ae0c3a5f4..dd411448f 100644
--- a/app/src/main/java/org/linphone/fragments/AboutFragment.java
+++ b/app/src/main/java/org/linphone/fragments/AboutFragment.java
@@ -40,7 +40,7 @@ import org.linphone.R;
 import org.linphone.core.Core;
 import org.linphone.core.Core.LogCollectionUploadState;
 import org.linphone.core.CoreListenerStub;
-import org.linphone.mediastream.Log;
+import org.linphone.core.tools.Log;
 import org.linphone.settings.LinphonePreferences;
 
 public class AboutFragment extends Fragment implements OnClickListener {
diff --git a/app/src/main/java/org/linphone/fragments/DialerFragment.java b/app/src/main/java/org/linphone/fragments/DialerFragment.java
index 5eb7ce1fa..2dd72a331 100644
--- a/app/src/main/java/org/linphone/fragments/DialerFragment.java
+++ b/app/src/main/java/org/linphone/fragments/DialerFragment.java
@@ -36,7 +36,7 @@ import org.linphone.LinphoneService;
 import org.linphone.R;
 import org.linphone.contacts.ContactsManager;
 import org.linphone.core.Core;
-import org.linphone.mediastream.Log;
+import org.linphone.core.tools.Log;
 import org.linphone.views.AddressAware;
 import org.linphone.views.AddressText;
 import org.linphone.views.CallButton;
diff --git a/app/src/main/java/org/linphone/fragments/StatusFragment.java b/app/src/main/java/org/linphone/fragments/StatusFragment.java
index 6bbda48a2..519bca012 100644
--- a/app/src/main/java/org/linphone/fragments/StatusFragment.java
+++ b/app/src/main/java/org/linphone/fragments/StatusFragment.java
@@ -50,7 +50,7 @@ import org.linphone.core.Event;
 import org.linphone.core.MediaEncryption;
 import org.linphone.core.ProxyConfig;
 import org.linphone.core.RegistrationState;
-import org.linphone.mediastream.Log;
+import org.linphone.core.tools.Log;
 import org.linphone.settings.LinphonePreferences;
 
 public class StatusFragment extends Fragment {
diff --git a/app/src/main/java/org/linphone/history/HistoryDetailFragment.java b/app/src/main/java/org/linphone/history/HistoryDetailFragment.java
index 976fc53ae..337789fc7 100644
--- a/app/src/main/java/org/linphone/history/HistoryDetailFragment.java
+++ b/app/src/main/java/org/linphone/history/HistoryDetailFragment.java
@@ -39,8 +39,8 @@ import org.linphone.core.ChatRoomListenerStub;
 import org.linphone.core.Core;
 import org.linphone.core.Factory;
 import org.linphone.core.ProxyConfig;
+import org.linphone.core.tools.Log;
 import org.linphone.fragments.FragmentsAvailable;
-import org.linphone.mediastream.Log;
 import org.linphone.settings.LinphonePreferences;
 import org.linphone.utils.ImageUtils;
 import org.linphone.utils.LinphoneUtils;
diff --git a/app/src/main/java/org/linphone/notifications/NotificationBroadcastReceiver.java b/app/src/main/java/org/linphone/notifications/NotificationBroadcastReceiver.java
index d1e886324..23565460b 100644
--- a/app/src/main/java/org/linphone/notifications/NotificationBroadcastReceiver.java
+++ b/app/src/main/java/org/linphone/notifications/NotificationBroadcastReceiver.java
@@ -36,7 +36,7 @@ import org.linphone.core.ChatMessage;
 import org.linphone.core.ChatMessageListenerStub;
 import org.linphone.core.ChatRoom;
 import org.linphone.core.Core;
-import org.linphone.mediastream.Log;
+import org.linphone.core.tools.Log;
 
 public class NotificationBroadcastReceiver extends BroadcastReceiver {
     @Override
diff --git a/app/src/main/java/org/linphone/notifications/NotificationsManager.java b/app/src/main/java/org/linphone/notifications/NotificationsManager.java
index 2e678b194..fbe3f7484 100644
--- a/app/src/main/java/org/linphone/notifications/NotificationsManager.java
+++ b/app/src/main/java/org/linphone/notifications/NotificationsManager.java
@@ -39,7 +39,7 @@ import org.linphone.contacts.ContactsManager;
 import org.linphone.contacts.LinphoneContact;
 import org.linphone.core.Address;
 import org.linphone.core.Call;
-import org.linphone.mediastream.Log;
+import org.linphone.core.tools.Log;
 import org.linphone.mediastream.Version;
 import org.linphone.settings.LinphonePreferences;
 import org.linphone.utils.ImageUtils;
diff --git a/app/src/main/java/org/linphone/purchase/InAppPurchaseActivity.java b/app/src/main/java/org/linphone/purchase/InAppPurchaseActivity.java
index 4f5382f0f..b78d5f793 100644
--- a/app/src/main/java/org/linphone/purchase/InAppPurchaseActivity.java
+++ b/app/src/main/java/org/linphone/purchase/InAppPurchaseActivity.java
@@ -32,7 +32,7 @@ import android.widget.Toast;
 import java.util.ArrayList;
 import java.util.List;
 import org.linphone.R;
-import org.linphone.mediastream.Log;
+import org.linphone.core.tools.Log;
 import org.linphone.settings.LinphonePreferences;
 import org.linphone.xmlrpc.XmlRpcHelper;
 import org.linphone.xmlrpc.XmlRpcListenerBase;
diff --git a/app/src/main/java/org/linphone/purchase/InAppPurchaseHelper.java b/app/src/main/java/org/linphone/purchase/InAppPurchaseHelper.java
index 6273dbd93..517c17ff4 100644
--- a/app/src/main/java/org/linphone/purchase/InAppPurchaseHelper.java
+++ b/app/src/main/java/org/linphone/purchase/InAppPurchaseHelper.java
@@ -37,7 +37,7 @@ import java.util.ArrayList;
 import java.util.regex.Pattern;
 import org.json.JSONException;
 import org.json.JSONObject;
-import org.linphone.mediastream.Log;
+import org.linphone.core.tools.Log;
 import org.linphone.settings.LinphonePreferences;
 import org.linphone.xmlrpc.XmlRpcHelper;
 import org.linphone.xmlrpc.XmlRpcListenerBase;
diff --git a/app/src/main/java/org/linphone/receivers/BluetoothManager.java b/app/src/main/java/org/linphone/receivers/BluetoothManager.java
index 666419f32..f5c7e0411 100644
--- a/app/src/main/java/org/linphone/receivers/BluetoothManager.java
+++ b/app/src/main/java/org/linphone/receivers/BluetoothManager.java
@@ -32,7 +32,7 @@ import java.util.List;
 import org.linphone.LinphoneManager;
 import org.linphone.LinphoneService;
 import org.linphone.call.CallActivity;
-import org.linphone.mediastream.Log;
+import org.linphone.core.tools.Log;
 
 public class BluetoothManager extends BroadcastReceiver {
     private static BluetoothManager sInstance;
diff --git a/app/src/main/java/org/linphone/receivers/DozeReceiver.java b/app/src/main/java/org/linphone/receivers/DozeReceiver.java
index 110eb3a46..5109e999c 100644
--- a/app/src/main/java/org/linphone/receivers/DozeReceiver.java
+++ b/app/src/main/java/org/linphone/receivers/DozeReceiver.java
@@ -27,7 +27,7 @@ import org.linphone.LinphoneManager;
 import org.linphone.LinphoneService;
 import org.linphone.R;
 import org.linphone.core.Core;
-import org.linphone.mediastream.Log;
+import org.linphone.core.tools.Log;
 import org.linphone.settings.LinphonePreferences;
 import org.linphone.utils.LinphoneUtils;
 
diff --git a/app/src/main/java/org/linphone/receivers/HookReceiver.java b/app/src/main/java/org/linphone/receivers/HookReceiver.java
index c42be6e83..f58936667 100644
--- a/app/src/main/java/org/linphone/receivers/HookReceiver.java
+++ b/app/src/main/java/org/linphone/receivers/HookReceiver.java
@@ -24,7 +24,7 @@ import android.content.Context;
 import android.content.Intent;
 import android.os.Bundle;
 import org.linphone.LinphoneManager;
-import org.linphone.mediastream.Log;
+import org.linphone.core.tools.Log;
 
 public class HookReceiver extends BroadcastReceiver {
     @Override
diff --git a/app/src/main/java/org/linphone/receivers/KeepAliveReceiver.java b/app/src/main/java/org/linphone/receivers/KeepAliveReceiver.java
index 827cd0c96..ff9d11428 100644
--- a/app/src/main/java/org/linphone/receivers/KeepAliveReceiver.java
+++ b/app/src/main/java/org/linphone/receivers/KeepAliveReceiver.java
@@ -29,7 +29,7 @@ import org.linphone.LinphoneManager;
 import org.linphone.LinphoneService;
 import org.linphone.R;
 import org.linphone.core.Core;
-import org.linphone.mediastream.Log;
+import org.linphone.core.tools.Log;
 import org.linphone.settings.LinphonePreferences;
 import org.linphone.utils.LinphoneUtils;
 
diff --git a/app/src/main/java/org/linphone/recording/Recording.java b/app/src/main/java/org/linphone/recording/Recording.java
index 79405fae3..7e178695d 100644
--- a/app/src/main/java/org/linphone/recording/Recording.java
+++ b/app/src/main/java/org/linphone/recording/Recording.java
@@ -31,7 +31,7 @@ import java.util.regex.Pattern;
 import org.linphone.LinphoneManager;
 import org.linphone.core.Player;
 import org.linphone.core.PlayerListener;
-import org.linphone.mediastream.Log;
+import org.linphone.core.tools.Log;
 
 class Recording implements PlayerListener, Comparable<Recording> {
     public static final Pattern RECORD_PATTERN =
diff --git a/app/src/main/java/org/linphone/settings/AccountPreferencesFragment.java b/app/src/main/java/org/linphone/settings/AccountPreferencesFragment.java
index bdd6870eb..021f5855b 100644
--- a/app/src/main/java/org/linphone/settings/AccountPreferencesFragment.java
+++ b/app/src/main/java/org/linphone/settings/AccountPreferencesFragment.java
@@ -39,8 +39,8 @@ import org.linphone.core.AccountCreatorListener;
 import org.linphone.core.CoreException;
 import org.linphone.core.NatPolicy;
 import org.linphone.core.ProxyConfig;
+import org.linphone.core.tools.Log;
 import org.linphone.fragments.FragmentsAvailable;
-import org.linphone.mediastream.Log;
 import org.linphone.settings.LinphonePreferences.AccountBuilder;
 import org.linphone.utils.LinphoneUtils;
 
diff --git a/app/src/main/java/org/linphone/settings/LinphonePreferences.java b/app/src/main/java/org/linphone/settings/LinphonePreferences.java
index a56a66161..8cee50942 100644
--- a/app/src/main/java/org/linphone/settings/LinphonePreferences.java
+++ b/app/src/main/java/org/linphone/settings/LinphonePreferences.java
@@ -46,7 +46,7 @@ import org.linphone.core.Transports;
 import org.linphone.core.Tunnel;
 import org.linphone.core.TunnelConfig;
 import org.linphone.core.VideoActivationPolicy;
-import org.linphone.mediastream.Log;
+import org.linphone.core.tools.Log;
 import org.linphone.purchase.Purchasable;
 import org.linphone.utils.LinphoneUtils;
 
diff --git a/app/src/main/java/org/linphone/settings/PreferencesListFragment.java b/app/src/main/java/org/linphone/settings/PreferencesListFragment.java
index 5dd13bffd..3b0205e56 100644
--- a/app/src/main/java/org/linphone/settings/PreferencesListFragment.java
+++ b/app/src/main/java/org/linphone/settings/PreferencesListFragment.java
@@ -40,7 +40,7 @@ import android.widget.RelativeLayout;
 import java.lang.reflect.Constructor;
 import java.lang.reflect.Method;
 import org.linphone.R;
-import org.linphone.mediastream.Log;
+import org.linphone.core.tools.Log;
 
 @SuppressLint("ValidFragment")
 public class PreferencesListFragment extends ListFragment {
diff --git a/app/src/main/java/org/linphone/settings/SettingsFragment.java b/app/src/main/java/org/linphone/settings/SettingsFragment.java
index 4d4aacc23..f36dc986b 100644
--- a/app/src/main/java/org/linphone/settings/SettingsFragment.java
+++ b/app/src/main/java/org/linphone/settings/SettingsFragment.java
@@ -58,9 +58,9 @@ import org.linphone.core.PayloadType;
 import org.linphone.core.ProxyConfig;
 import org.linphone.core.RegistrationState;
 import org.linphone.core.VideoDefinition;
+import org.linphone.core.tools.Log;
 import org.linphone.core.tools.OpenH264DownloadHelper;
 import org.linphone.fragments.FragmentsAvailable;
-import org.linphone.mediastream.Log;
 import org.linphone.mediastream.Version;
 import org.linphone.mediastream.video.capture.hwconf.AndroidCameraConfiguration;
 import org.linphone.utils.DeviceUtils;
diff --git a/app/src/main/java/org/linphone/utils/DeviceUtils.java b/app/src/main/java/org/linphone/utils/DeviceUtils.java
index edf88ab28..e31f9ba07 100644
--- a/app/src/main/java/org/linphone/utils/DeviceUtils.java
+++ b/app/src/main/java/org/linphone/utils/DeviceUtils.java
@@ -36,7 +36,7 @@ import android.widget.TextView;
 import androidx.core.content.ContextCompat;
 import java.util.List;
 import org.linphone.R;
-import org.linphone.mediastream.Log;
+import org.linphone.core.tools.Log;
 import org.linphone.settings.LinphonePreferences;
 
 public class DeviceUtils {
diff --git a/app/src/main/java/org/linphone/utils/FileUtils.java b/app/src/main/java/org/linphone/utils/FileUtils.java
index 2f110b0ff..8a636c546 100644
--- a/app/src/main/java/org/linphone/utils/FileUtils.java
+++ b/app/src/main/java/org/linphone/utils/FileUtils.java
@@ -43,7 +43,7 @@ import org.linphone.core.ChatMessage;
 import org.linphone.core.Content;
 import org.linphone.core.Friend;
 import org.linphone.core.FriendList;
-import org.linphone.mediastream.Log;
+import org.linphone.core.tools.Log;
 
 public class FileUtils {
     public static String getNameFromFilePath(String filePath) {
diff --git a/app/src/main/java/org/linphone/utils/ImageUtils.java b/app/src/main/java/org/linphone/utils/ImageUtils.java
index 88825d8da..d451365fa 100644
--- a/app/src/main/java/org/linphone/utils/ImageUtils.java
+++ b/app/src/main/java/org/linphone/utils/ImageUtils.java
@@ -37,7 +37,7 @@ import java.io.InputStream;
 import java.net.URL;
 import org.linphone.R;
 import org.linphone.contacts.ContactsManager;
-import org.linphone.mediastream.Log;
+import org.linphone.core.tools.Log;
 
 public class ImageUtils {
 
diff --git a/app/src/main/java/org/linphone/utils/LinphoneUtils.java b/app/src/main/java/org/linphone/utils/LinphoneUtils.java
index 6ce90703f..a95088e0f 100644
--- a/app/src/main/java/org/linphone/utils/LinphoneUtils.java
+++ b/app/src/main/java/org/linphone/utils/LinphoneUtils.java
@@ -53,7 +53,7 @@ import org.linphone.core.Core;
 import org.linphone.core.Factory;
 import org.linphone.core.LogCollectionState;
 import org.linphone.core.ProxyConfig;
-import org.linphone.mediastream.Log;
+import org.linphone.core.tools.Log;
 import org.linphone.settings.LinphonePreferences;
 
 /** Helpers. */
diff --git a/app/src/main/java/org/linphone/utils/MediaScanner.java b/app/src/main/java/org/linphone/utils/MediaScanner.java
index d5f4e4180..7051924ee 100644
--- a/app/src/main/java/org/linphone/utils/MediaScanner.java
+++ b/app/src/main/java/org/linphone/utils/MediaScanner.java
@@ -23,7 +23,7 @@ import android.content.Context;
 import android.media.MediaScannerConnection;
 import android.net.Uri;
 import java.io.File;
-import org.linphone.mediastream.Log;
+import org.linphone.core.tools.Log;
 
 public class MediaScanner implements MediaScannerConnection.MediaScannerConnectionClient {
     private final MediaScannerConnection mMediaConnection;
diff --git a/app/src/main/java/org/linphone/views/BitmapWorkerTask.java b/app/src/main/java/org/linphone/views/BitmapWorkerTask.java
index 45be955ef..20930181e 100644
--- a/app/src/main/java/org/linphone/views/BitmapWorkerTask.java
+++ b/app/src/main/java/org/linphone/views/BitmapWorkerTask.java
@@ -33,7 +33,7 @@ import android.widget.ImageView;
 import android.widget.RelativeLayout;
 import java.io.IOException;
 import java.lang.ref.WeakReference;
-import org.linphone.mediastream.Log;
+import org.linphone.core.tools.Log;
 import org.linphone.utils.FileUtils;
 import org.linphone.utils.ImageUtils;
 
diff --git a/app/src/main/java/org/linphone/views/ContactAvatar.java b/app/src/main/java/org/linphone/views/ContactAvatar.java
index 18eda1236..df7b6133c 100644
--- a/app/src/main/java/org/linphone/views/ContactAvatar.java
+++ b/app/src/main/java/org/linphone/views/ContactAvatar.java
@@ -29,7 +29,7 @@ import org.linphone.LinphoneService;
 import org.linphone.R;
 import org.linphone.contacts.LinphoneContact;
 import org.linphone.core.ChatRoomSecurityLevel;
-import org.linphone.mediastream.Log;
+import org.linphone.core.tools.Log;
 import org.linphone.utils.ImageUtils;
 
 class ContactAvatarHolder {
diff --git a/app/src/main/java/org/linphone/views/Digit.java b/app/src/main/java/org/linphone/views/Digit.java
index f3b973fbd..5d092fedd 100644
--- a/app/src/main/java/org/linphone/views/Digit.java
+++ b/app/src/main/java/org/linphone/views/Digit.java
@@ -33,7 +33,7 @@ import org.linphone.LinphoneService;
 import org.linphone.R;
 import org.linphone.call.CallActivity;
 import org.linphone.core.Core;
-import org.linphone.mediastream.Log;
+import org.linphone.core.tools.Log;
 import org.linphone.settings.LinphonePreferences;
 
 @SuppressLint("AppCompatCustomView")
diff --git a/app/src/main/java/org/linphone/xmlrpc/XmlRpcHelper.java b/app/src/main/java/org/linphone/xmlrpc/XmlRpcHelper.java
index 39a3395fc..79bf8e734 100644
--- a/app/src/main/java/org/linphone/xmlrpc/XmlRpcHelper.java
+++ b/app/src/main/java/org/linphone/xmlrpc/XmlRpcHelper.java
@@ -25,7 +25,7 @@ import org.linphone.core.XmlRpcRequest;
 import org.linphone.core.XmlRpcRequestListener;
 import org.linphone.core.XmlRpcSession;
 import org.linphone.core.XmlRpcStatus;
-import org.linphone.mediastream.Log;
+import org.linphone.core.tools.Log;
 import org.linphone.settings.LinphonePreferences;
 
 public class XmlRpcHelper {