Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
TreeHugger Robot
2018-12-13 04:55:03 +00:00
committed by Android (Google) Code Review
parent 7b9a9bb885 163d8ea6c9
commit 688dc83a8e
2 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
services/core/java/com/android/server/ConnectivityService.java
View File

@@ -4731,11 +4731,12 @@ public class ConnectivityService extends IConnectivityManager.Stub
} else { } else {
updateProxy(newLp, oldLp, networkAgent); updateProxy(newLp, oldLp, networkAgent);
} }
synchronized (networkAgent) {
networkAgent.linkProperties = newLp;
}
// TODO - move this check to cover the whole function // TODO - move this check to cover the whole function
if (!Objects.equals(newLp, oldLp)) { if (!Objects.equals(newLp, oldLp)) {
synchronized (networkAgent) {
networkAgent.linkProperties = newLp;
}
notifyIfacesChangedForNetworkStats(); notifyIfacesChangedForNetworkStats();
notifyNetworkCallbacks(networkAgent, ConnectivityManager.CALLBACK_IP_CHANGED); notifyNetworkCallbacks(networkAgent, ConnectivityManager.CALLBACK_IP_CHANGED);
} }

8
tests/net/java/com/android/server/ConnectivityServiceTest.java
View File

@@ -4024,6 +4024,14 @@ public class ConnectivityServiceTest {
cellNetworkCallback.assertNoCallback(); cellNetworkCallback.assertNoCallback();
assertTrue(((LinkProperties)cbi.arg).isPrivateDnsActive()); assertTrue(((LinkProperties)cbi.arg).isPrivateDnsActive());
assertEquals("strict.example.com", ((LinkProperties)cbi.arg).getPrivateDnsServerName()); 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 @Test