Merge "Ensure handleUpdateLinkProperties runs on the CS handler thread." am: 57ca4b2743 am: dc987ea9e3

am: aa5da2303c

Change-Id: I507dfcdef170cfb02084899891308b078a6700de
This commit is contained in:
Lorenzo Colitti
2019-03-01 22:16:19 -08:00
committed by android-build-merger

View File

@@ -5631,6 +5631,8 @@ public class ConnectivityService extends IConnectivityManager.Stub
} }
public void handleUpdateLinkProperties(NetworkAgentInfo nai, LinkProperties newLp) { public void handleUpdateLinkProperties(NetworkAgentInfo nai, LinkProperties newLp) {
ensureRunningOnConnectivityServiceThread();
if (getNetworkAgentInfoForNetId(nai.network.netId) != nai) { if (getNetworkAgentInfoForNetId(nai.network.netId) != nai) {
// Ignore updates for disconnected networks // Ignore updates for disconnected networks
return; return;