From 2c4a47d65ce5bd424d76c5a9259904c3e7b29063 Mon Sep 17 00:00:00 2001 From: Remi NGUYEN VAN Date: Tue, 12 May 2020 08:53:53 +0000 Subject: [PATCH] Send full LinkProperties to NetworkMonitor Set the parcelSensitiveFields bit when sending LinkProperties to NetworkMonitor, so that the captive portal API URL is not lost. Test: atest ConnectivityServiceIntegrationTest (see followup change) Bug: 156062304 Original-Change: https://android-review.googlesource.com/1307833 Merged-In: Ifd4e9c02a6b9a2b2b8b254fc4da7bfb9e0a84550 Change-Id: Ifd4e9c02a6b9a2b2b8b254fc4da7bfb9e0a84550 --- .../core/java/com/android/server/ConnectivityService.java | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/services/core/java/com/android/server/ConnectivityService.java b/services/core/java/com/android/server/ConnectivityService.java index 2c63c6f8a6..4db00e3c5f 100644 --- a/services/core/java/com/android/server/ConnectivityService.java +++ b/services/core/java/com/android/server/ConnectivityService.java @@ -5973,7 +5973,8 @@ public class ConnectivityService extends IConnectivityManager.Stub // Start or stop DNS64 detection and 464xlat according to network state. networkAgent.clatd.update(); notifyIfacesChangedForNetworkStats(); - networkAgent.networkMonitor().notifyLinkPropertiesChanged(newLp); + networkAgent.networkMonitor().notifyLinkPropertiesChanged( + new LinkProperties(newLp, true /* parcelSensitiveFields */)); if (networkAgent.everConnected) { notifyNetworkCallbacks(networkAgent, ConnectivityManager.CALLBACK_IP_CHANGED); } @@ -7153,7 +7154,9 @@ public class ConnectivityService extends IConnectivityManager.Stub networkAgent.networkMonitor().setAcceptPartialConnectivity(); } networkAgent.networkMonitor().notifyNetworkConnected( - networkAgent.linkProperties, networkAgent.networkCapabilities); + new LinkProperties(networkAgent.linkProperties, + true /* parcelSensitiveFields */), + networkAgent.networkCapabilities); scheduleUnvalidatedPrompt(networkAgent); // Whether a particular NetworkRequest listen should cause signal strength thresholds to