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

Merge "Block address families with routes, not NetworkAgent side channel" into lmp-dev

Browse Source
This commit is contained in:
Lorenzo Colitti
2014-09-24 01:21:04 +00:00
committed by Android (Google) Code Review
parent 4a8196d434 83d12dbbb7
commit 1ba96545b3
2 changed files with 2 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1884,36 +1884,6 @@ public class ConnectivityService extends IConnectivityManager.Stub {
}
break;
}
case NetworkAgent.EVENT_BLOCK_ADDRESS_FAMILY: {
NetworkAgentInfo nai = mNetworkAgentInfos.get(msg.replyTo);
if (nai == null) {
loge("EVENT_BLOCK_ADDRESS_FAMILY from unknown NetworkAgent");
break;
}
try {
mNetd.blockAddressFamily((Integer) msg.obj, nai.network.netId,
nai.linkProperties.getInterfaceName());
} catch (Exception e) {
// Never crash!
loge("Exception in blockAddressFamily: " + e);
}
break;
}
case NetworkAgent.EVENT_UNBLOCK_ADDRESS_FAMILY: {
NetworkAgentInfo nai = mNetworkAgentInfos.get(msg.replyTo);
if (nai == null) {
loge("EVENT_UNBLOCK_ADDRESS_FAMILY from unknown NetworkAgent");
break;
}
try {
mNetd.unblockAddressFamily((Integer) msg.obj, nai.network.netId,
nai.linkProperties.getInterfaceName());
} catch (Exception e) {
// Never crash!
loge("Exception in blockAddressFamily: " + e);
}
break;
}
case NetworkAgent.EVENT_SET_EXPLICITLY_SELECTED: {
NetworkAgentInfo nai = mNetworkAgentInfos.get(msg.replyTo);
if (nai == null) {