From b93213f8e37ca1e05588af7e13c6b3c341f6ac41 Mon Sep 17 00:00:00 2001
From: Sylvain Berfini <sylvain.berfini@belledonne-communications.com>
Date: Wed, 14 Jul 2021 12:04:44 +0200
Subject: [PATCH] Prevent crash in Android's network manager if Core enters
foreground/background before it is started
---
.../org/linphone/core/tools/AndroidPlatformHelper.java | 10 ++++++++++
1 file changed, 10 insertions(+)
diff --git a/wrappers/java/classes/org/linphone/core/tools/AndroidPlatformHelper.java b/wrappers/java/classes/org/linphone/core/tools/AndroidPlatformHelper.java
index 1f0a704636..c6a70bdddd 100644
--- a/wrappers/java/classes/org/linphone/core/tools/AndroidPlatformHelper.java
+++ b/wrappers/java/classes/org/linphone/core/tools/AndroidPlatformHelper.java
@@ -605,6 +605,11 @@ public class AndroidPlatformHelper {
}
public synchronized boolean isActiveNetworkWifiOnlyCompliant() {
+ if (mNetworkManager == null) {
+ Log.w("[Platform Helper] Network Manager is null, assuming network isn't WiFi only compliant");
+ return false;
+ }
+
NetworkInfo networkInfo = mNetworkManager.getActiveNetworkInfo();
if (networkInfo != null) {
Log.i("[Platform Helper] Active network type is " + networkInfo.getTypeName());
@@ -623,6 +628,11 @@ public class AndroidPlatformHelper {
return;
}
+ if (mNetworkManager == null) {
+ Log.w("[Platform Helper] Network Manager is null, stopping there");
+ return;
+ }
+
boolean connected = mNetworkManager.isCurrentlyConnected(mContext);
if (!connected) {
Log.i("[Platform Helper] No connectivity: setting network unreachable");
--
GitLab