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

am cf0f619a: Don\'t accept score below 0.

Browse Source 
* commit 'cf0f619a5080670415693ca772e079a494aaf7f7':
  Don't accept score below 0.
This commit is contained in:
Robert Greenwalt
2014-09-11 14:16:56 +00:00
committed by Android Git Automerger
parent 778f4ba51d cf0f619a50
commit f989264b68
1 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
service-t/src/com/android/server/ethernet/EthernetNetworkFactory.java
View File

@@ -140,6 +140,9 @@ class EthernetNetworkFactory {
mNetworkInfo.setDetailedState(DetailedState.DISCONNECTED, null, mHwAddr); mNetworkInfo.setDetailedState(DetailedState.DISCONNECTED, null, mHwAddr);
} }
updateAgent(); updateAgent();
// set our score lower than any network could go
// so we get dropped. TODO - just unregister the factory
// when link goes down.
mFactory.setScoreFilter(up ? NETWORK_SCORE : -1); mFactory.setScoreFilter(up ? NETWORK_SCORE : -1);
} }
} }
@@ -246,7 +249,8 @@ class EthernetNetworkFactory {
mNetworkAgent.sendNetworkCapabilities(mNetworkCapabilities); mNetworkAgent.sendNetworkCapabilities(mNetworkCapabilities);
mNetworkAgent.sendNetworkInfo(mNetworkInfo); mNetworkAgent.sendNetworkInfo(mNetworkInfo);
mNetworkAgent.sendLinkProperties(mLinkProperties); mNetworkAgent.sendLinkProperties(mLinkProperties);
mNetworkAgent.sendNetworkScore(mLinkUp? NETWORK_SCORE : -1); // never set the network score below 0.
mNetworkAgent.sendNetworkScore(mLinkUp? NETWORK_SCORE : 0);
} }
} }
@@ -277,6 +281,8 @@ class EthernetNetworkFactory {
// noticing. // noticing.
if (!NetworkUtils.runDhcp(mIface, dhcpResults)) { if (!NetworkUtils.runDhcp(mIface, dhcpResults)) {
Log.e(TAG, "DHCP request error:" + NetworkUtils.getDhcpError()); Log.e(TAG, "DHCP request error:" + NetworkUtils.getDhcpError());
// set our score lower than any network could go
// so we get dropped.
mFactory.setScoreFilter(-1); mFactory.setScoreFilter(-1);
return; return;
} }