From 9bab79798f9dedddecf6b6a22adb5dd9e8d3971b Mon Sep 17 00:00:00 2001
From: Sylvain Berfini <sylvain.berfini@belledonne-communications.com>
Date: Mon, 11 Sep 2023 16:14:57 +0200
Subject: [PATCH] Fixed crash on Android if native audio is enabled by
androidx.media dependency isn't declared in app
---
.../org/linphone/core/tools/service/CoreManager.java | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/wrappers/java/classes/org/linphone/core/tools/service/CoreManager.java b/wrappers/java/classes/org/linphone/core/tools/service/CoreManager.java
index 4a297852bd..0dc60debfd 100644
--- a/wrappers/java/classes/org/linphone/core/tools/service/CoreManager.java
+++ b/wrappers/java/classes/org/linphone/core/tools/service/CoreManager.java
@@ -139,10 +139,6 @@ public class CoreManager {
mAudioHelper = new AudioHelper(mContext);
} else {
Log.w("[Core Manager] Do you have a dependency on androidx.media:media:1.2.0 or newer?");
- if (core.isNativeRingingEnabled()) {
- Log.e("[Core Manager] Native ringing was enabled but condition isn't met (androidx.media:media dependency), disabling it.");
- core.setNativeRingingEnabled(false);
- }
}
mBluetoothHelper = new BluetoothHelper(mContext);
@@ -246,6 +242,11 @@ public class CoreManager {
public void onLinphoneCoreStart() {
Log.i("[Core Manager] Starting");
+ if (!isAndroidXMediaAvailable() && mCore.isNativeRingingEnabled()) {
+ Log.e("[Core Manager] Native ringing was enabled but condition isn't met (androidx.media:media dependency), disabling it.");
+ mCore.setNativeRingingEnabled(false);
+ }
+
if (mCore.isAutoIterateEnabled()) {
// Force the core.iterate() scheduling to a low value to ensure the Core will be ready as quickly as possible
Log.i("[Core Manager] Core is starting, scheduling core.iterate() every " + AUTO_ITERATE_TIMER_CORE_START_OR_PUSH_RECEIVED + "ms");
--
GitLab