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

am d9685fac: am ea651a4f: Merge "Update network selections on capability change." into lmp-mr1-dev

Browse Source 
* commit 'd9685fac35c1c3ba797eb9e534ec15888aaa3a8b':
  Update network selections on capability change.
This commit is contained in:
Jeff Davidson
2014-11-05 18:55:40 +00:00
committed by Android Git Automerger
parent cac8e4a5aa d9685fac35
commit a820564d9c
1 changed files with 1 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -3701,12 +3701,11 @@ public class ConnectivityService extends IConnectivityManager.Stub {
private void updateCapabilities(NetworkAgentInfo networkAgent,
NetworkCapabilities networkCapabilities) {
// TODO - turn this on in MR1 when we have more dogfooding time.
// rematchAllNetworksAndRequests();
if (!Objects.equals(networkAgent.networkCapabilities, networkCapabilities)) {
synchronized (networkAgent) {
networkAgent.networkCapabilities = networkCapabilities;
}
rematchAllNetworksAndRequests(networkAgent, networkAgent.getCurrentScore());
notifyNetworkCallbacks(networkAgent, ConnectivityManager.CALLBACK_CAP_CHANGED);
}
}