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

Commit 688dc83a authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "DO NOT MERGE fix some linkproperties configs missing" into pi-dev

parents 7b9a9bb8 163d8ea6

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

+4 −3
Original line number Diff line number Diff line
@@ -4731,11 +4731,12 @@ public class ConnectivityService extends IConnectivityManager.Stub 
        } else {

            updateProxy(newLp, oldLp, networkAgent);

        }

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

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



        synchronized (networkAgent) {

            networkAgent.linkProperties = newLp;

        }

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

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

            notifyIfacesChangedForNetworkStats();

            notifyNetworkCallbacks(networkAgent, ConnectivityManager.CALLBACK_IP_CHANGED);

        }

tests/net/java/com/android/server/ConnectivityServiceTest.java

+8 −0
Original line number Diff line number Diff line
@@ -4024,6 +4024,14 @@ public class ConnectivityServiceTest { 
        cellNetworkCallback.assertNoCallback();

        assertTrue(((LinkProperties)cbi.arg).isPrivateDnsActive());

        assertEquals("strict.example.com", ((LinkProperties)cbi.arg).getPrivateDnsServerName());



        // Send the same LinkProperties and expect getting the same result including private dns.

        // b/118518971

        LinkProperties oldLp = (LinkProperties) cbi.arg;

        mCellNetworkAgent.sendLinkProperties(cellLp);

        waitForIdle();

        LinkProperties newLp = mCm.getLinkProperties(cbi.network);

        assertEquals(oldLp, newLp);

    }



    @Test