commit cfff01e2dbece7fd6a45f0352c4ab292cf59b89e
author Remi NGUYEN VAN <reminv@google.com> Wed Feb 13 20:58:59 2019 +0900
committer Remi NGUYEN VAN <reminv@google.com> Fri Feb 15 12:20:03 2019 +0900
tree 9d1dc8aee4e9f8524aa7bde6e3cf8d54d0fb430a
parent dacee147b482e17308be0977765e8135b37b9690

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

Android.bp

diff --git a/Android.bp b/Android.bp
index 4ba757a..9df0372 100644
--- a/Android.bp
+++ b/Android.bp
@@ -186,6 +186,7 @@
         "core/java/android/hardware/radio/ITunerCallback.aidl",
         "core/java/android/hardware/soundtrigger/IRecognitionStatusCallback.aidl",
         "core/java/android/hardware/usb/IUsbManager.aidl",
+        "core/java/android/net/ICaptivePortal.aidl",
         "core/java/android/net/IConnectivityManager.aidl",
         "core/java/android/net/IIpConnectivityMetrics.aidl",
         "core/java/android/net/IEthernetManager.aidl",
@@ -815,7 +816,6 @@
     srcs: [
         "core/java/android/net/ApfCapabilitiesParcelable.aidl",
         "core/java/android/net/DhcpResultsParcelable.aidl",
-        "core/java/android/net/ICaptivePortal.aidl",
         "core/java/android/net/INetworkMonitor.aidl",
         "core/java/android/net/INetworkMonitorCallbacks.aidl",
         "core/java/android/net/IIpMemoryStore.aidl",