Add CaptivePortalData fetching to NetworkMonitor

When a capport API URL is sent through notifyNetworkConnected or
notifyLinkPropertiesChanged, NetworkMonitor will (re)evaluate to
fetch the data, and report it back via notifyCaptivePortalDataChanged.

Test: atest NetworkStackTests NetworkStackNextTests
Bug: 139269711
Change-Id: I101e2b2799d399fa7b560bf5ea3d86dac7ba1be9

1 files changed, 2 insertions, 0 deletions

diff --git a/common/moduleutils/src/android/net/shared/IpConfigurationParcelableUtil.java b/common/moduleutils/src/android/net/shared/IpConfigurationParcelableUtil.java
index 172dc24..7ef764b 100644
--- a/common/moduleutils/src/android/net/shared/IpConfigurationParcelableUtil.java
+++ b/common/moduleutils/src/android/net/shared/IpConfigurationParcelableUtil.java
@@ -42,6 +42,7 @@ public final class IpConfigurationParcelableUtil {
         p.serverAddress = parcelAddress(results.serverAddress);
         p.vendorInfo = results.vendorInfo;
         p.serverHostName = results.serverHostName;
+        p.captivePortalApiUrl = results.captivePortalApiUrl;
         return p;
     }
 
@@ -56,6 +57,7 @@ public final class IpConfigurationParcelableUtil {
         results.serverAddress = (Inet4Address) unparcelAddress(p.serverAddress);
         results.vendorInfo = p.vendorInfo;
         results.serverHostName = p.serverHostName;
+        results.captivePortalApiUrl = p.captivePortalApiUrl;
         return results;
     }