commit bdbe7b72fe0cedf9902ae09aed56f0bb8ef726f3
author Remi NGUYEN VAN <reminv@google.com> Tue May 12 08:13:05 2020 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue May 12 08:13:05 2020 +0000
tree 9fec1da4a4763fbe5155870a3e87d5fc3a494699
parent fbd6a2c012b12b39f84b56ca43749274df5092ac
parent c9f24746f2cfa7d3402e2b8f7b048bf8fcc26a75

Merge "Send full LinkProperties to NetworkMonitor"

services/core/java/com/android/server/ConnectivityService.java

diff --git a/services/core/java/com/android/server/ConnectivityService.java b/services/core/java/com/android/server/ConnectivityService.java
index 08aab2a..2eafa35 100644
--- a/services/core/java/com/android/server/ConnectivityService.java
+++ b/services/core/java/com/android/server/ConnectivityService.java
@@ -5969,7 +5969,8 @@
             // 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);
             }
@@ -7157,7 +7158,9 @@
                 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