From 564299a2a3f04607f0754ebdfa2381556cfa494c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sami=20Kalliom=C3=A4ki?= <sakal@webrtc.org>
Date: Thu, 8 Mar 2018 10:31:10 +0100
Subject: [PATCH] Fix applicationContext passed to NetworkMonitor from NDK
 being unused.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Bug: webrtc:8769
Change-Id: I7c50f5efece88019b04f8c298f44886ca8258509
Reviewed-on: https://webrtc-review.googlesource.com/60740
Reviewed-by: Magnus Jedvert <magjed@webrtc.org>
Commit-Queue: Sami Kalliomäki <sakal@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#22342}
---
 sdk/android/api/org/webrtc/NetworkMonitor.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/sdk/android/api/org/webrtc/NetworkMonitor.java b/sdk/android/api/org/webrtc/NetworkMonitor.java
index 05b52d946f..9a01882f4d 100644
--- a/sdk/android/api/org/webrtc/NetworkMonitor.java
+++ b/sdk/android/api/org/webrtc/NetworkMonitor.java
@@ -110,7 +110,8 @@ public class NetworkMonitor {
   private void startMonitoring(Context applicationContext, long nativeObserver) {
     Logging.d(TAG, "Start monitoring with native observer " + nativeObserver);
 
-    startMonitoring(ContextUtils.getApplicationContext());
+    startMonitoring(
+        applicationContext != null ? applicationContext : ContextUtils.getApplicationContext());
     // The native observers expect a network list update after they call startMonitoring.
     synchronized (nativeNetworkObservers) {
       nativeNetworkObservers.add(nativeObserver);