Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a30bb72b authored by Remi NGUYEN VAN's avatar Remi NGUYEN VAN Committed by Automerger Merge Worker
Browse files

Merge "Send full LinkProperties to NetworkMonitor" am: 5aa7d63b am: 386c3242 

Change-Id: I7e81f65e4b8f22a646dba191748133841a569d44
parents 008888df 386c3242

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

+5 −2
Original line number Original line Diff line number Diff line
@@ -5978,7 +5978,8 @@ public class ConnectivityService extends IConnectivityManager.Stub 
            // Start or stop DNS64 detection and 464xlat according to network state.

            // Start or stop DNS64 detection and 464xlat according to network state.

            networkAgent.clatd.update();

            networkAgent.clatd.update();

            notifyIfacesChangedForNetworkStats();

            notifyIfacesChangedForNetworkStats();

            networkAgent.networkMonitor().notifyLinkPropertiesChanged(newLp);

            networkAgent.networkMonitor().notifyLinkPropertiesChanged(

                    new LinkProperties(newLp, true /* parcelSensitiveFields */));

            if (networkAgent.everConnected) {

            if (networkAgent.everConnected) {

                notifyNetworkCallbacks(networkAgent, ConnectivityManager.CALLBACK_IP_CHANGED);

                notifyNetworkCallbacks(networkAgent, ConnectivityManager.CALLBACK_IP_CHANGED);

            }

            }
@@ -7166,7 +7167,9 @@ public class ConnectivityService extends IConnectivityManager.Stub 
                networkAgent.networkMonitor().setAcceptPartialConnectivity();

                networkAgent.networkMonitor().setAcceptPartialConnectivity();

            }

            }

            networkAgent.networkMonitor().notifyNetworkConnected(

            networkAgent.networkMonitor().notifyNetworkConnected(

                    networkAgent.linkProperties, networkAgent.networkCapabilities);

                    new LinkProperties(networkAgent.linkProperties,

                            true /* parcelSensitiveFields */),

                    networkAgent.networkCapabilities);

            scheduleUnvalidatedPrompt(networkAgent);

            scheduleUnvalidatedPrompt(networkAgent);





            // Whether a particular NetworkRequest listen should cause signal strength thresholds to

            // Whether a particular NetworkRequest listen should cause signal strength thresholds to