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

Commit f7d2845d authored by Chalard Jean's avatar Chalard Jean Committed by android-build-merger
Browse files

Merge "Fix a ConcurrentModificationException crash." into pi-dev am: 61d708ea 

am: 60b14354

Change-Id: I25007ac26349e451bb47f966af70d590d699c347
parents 9b0a01b9 60b14354

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

+4 −1
Original line number Diff line number Diff line
@@ -4674,7 +4674,7 @@ public class ConnectivityService extends IConnectivityManager.Stub 
    }



    private void updateLinkProperties(NetworkAgentInfo networkAgent, LinkProperties oldLp) {

        LinkProperties newLp = networkAgent.linkProperties;

        LinkProperties newLp = new LinkProperties(networkAgent.linkProperties);

        int netId = networkAgent.network.netId;



        // The NetworkAgentInfo does not know whether clatd is running on its network or not. Before
@@ -4708,6 +4708,9 @@ public class ConnectivityService extends IConnectivityManager.Stub 
        }

        // TODO - move this check to cover the whole function

        if (!Objects.equals(newLp, oldLp)) {

            synchronized (networkAgent) {

                networkAgent.linkProperties = newLp;

            }

            notifyIfacesChangedForNetworkStats();

            notifyNetworkCallbacks(networkAgent, ConnectivityManager.CALLBACK_IP_CHANGED);

        }