Merge "Ensure handleUpdateLinkProperties runs on the CS handler thread."

am: 57ca4b2743

Change-Id: I46e448611a23a9e75f05b0ab48d4af47175de6d4
This commit is contained in:
Lorenzo Colitti
2019-03-01 21:58:39 -08:00
committed by android-build-merger

View File

@@ -5565,6 +5565,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;