LineageOS/android_packages_modules_Connectivity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Snap for 5450365 from 3852c74552 to pi-platform-release

Browse Source 
Change-Id: I944e7d1ac9deebd68b7a3d2f3b8200df78a23099
This commit is contained in:
android-build-team Robot
2019-05-07 21:45:49 +00:00
parent 79cdc783ee 3852c74552
commit 06427c1a55
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 {
updateProxy(newLp, oldLp, networkAgent);
}
synchronized (networkAgent) {
networkAgent.linkProperties = newLp;
}
// 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);
}

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

@@ -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