From ad99e5443e12d36e4315c93a8cd4c30db8a1ff70 Mon Sep 17 00:00:00 2001
From: Remi NGUYEN VAN <reminv@google.com>
Date: Wed, 13 Feb 2019 20:58:59 +0900
Subject: Remove NetworkMonitor dependency on ICaptivePortal

ICaptivePortal is used in the framework and cannot be used as a
dependency in NetworkMonitor, as the framework class takes precedence
when linking.
Also fix NetworkMonitorTest that was not verifying the right
startCaptivePortalApp call.

Test: atest FrameworksNetTests NetworkStackTests
Bug: 124033493
Change-Id: I8e7bb79e50650ae182a2e4277fb49abf5fb6d910
Merged-In: Ib6a89e54312628662b130fbeec18d11e139f09fa
---
 src/com/android/server/NetworkStackService.java | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'src/com/android/server/NetworkStackService.java')

diff --git a/src/com/android/server/NetworkStackService.java b/src/com/android/server/NetworkStackService.java
index c6a207f..90db207 100644
--- a/src/com/android/server/NetworkStackService.java
+++ b/src/com/android/server/NetworkStackService.java
@@ -246,6 +246,12 @@ public class NetworkStackService extends Service {
             mNm.launchCaptivePortalApp();
         }
 
+        @Override
+        public void notifyCaptivePortalAppFinished(int response) {
+            checkNetworkStackCallingPermission();
+            mNm.notifyCaptivePortalAppFinished(response);
+        }
+
         @Override
         public void forceReevaluation(int uid) {
             checkNetworkStackCallingPermission();
-- 
cgit v1.2.3