am ac07396c: am 171a7ddd: am 44f95a18: Merge "Update the http proxy on LinkProperty change." into lmp-dev

* commit 'ac07396c94177549f8e977d95fe0163ed6898a10':
  Update the http proxy on LinkProperty change.
This commit is contained in:
Robert Greenwalt
2014-08-26 10:07:49 +00:00
committed by Android Git Automerger

View File

@@ -4196,6 +4196,7 @@ public class ConnectivityService extends IConnectivityManager.Stub {
final boolean flushDns = updateRoutes(newLp, oldLp, netId);
updateDnses(newLp, oldLp, netId, flushDns);
updateClat(newLp, oldLp, networkAgent);
if (isDefaultNetwork(networkAgent)) handleApplyDefaultProxy(newLp.getHttpProxy());
}
private void updateClat(LinkProperties newLp, LinkProperties oldLp, NetworkAgentInfo na) {