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

am 31453e5a: Merge "Reset connections on all stacked interfaces." into jb-mr2-dev

Browse Source 
* commit '31453e5a2b5150a18c41b8bebd85223615ad8849':
  Reset connections on all stacked interfaces.
This commit is contained in:
Lorenzo Colitti
2013-03-22 09:48:40 +00:00
committed by Android Git Automerger
parent 6a67c3e071 6383982582
commit 395f4066d5
2 changed files with 28 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
core/java/android/net/LinkProperties.java
View File

@@ -119,6 +119,15 @@ public class LinkProperties implements Parcelable {
return mIfaceName; return mIfaceName;
} }
public Collection<String> getAllInterfaceNames() {
Collection interfaceNames = new ArrayList<String>(mStackedLinks.size() + 1);
interfaceNames.add(new String(mIfaceName));
for (LinkProperties stacked: mStackedLinks.values()) {
interfaceNames.addAll(stacked.getAllInterfaceNames());
}
return interfaceNames;
}
public Collection<InetAddress> getAddresses() { public Collection<InetAddress> getAddresses() {
Collection<InetAddress> addresses = new ArrayList<InetAddress>(); Collection<InetAddress> addresses = new ArrayList<InetAddress>();
for (LinkAddress linkAddress : mLinkAddresses) { for (LinkAddress linkAddress : mLinkAddresses) {

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

@@ -2256,7 +2256,7 @@ public class ConnectivityService extends IConnectivityManager.Stub {
if (resetMask != 0 || resetDns) { if (resetMask != 0 || resetDns) {
LinkProperties linkProperties = mNetTrackers[netType].getLinkProperties(); LinkProperties linkProperties = mNetTrackers[netType].getLinkProperties();
if (linkProperties != null) { if (linkProperties != null) {
String iface = linkProperties.getInterfaceName(); for (String iface : linkProperties.getAllInterfaceNames()) {
if (TextUtils.isEmpty(iface) == false) { if (TextUtils.isEmpty(iface) == false) {
if (resetMask != 0) { if (resetMask != 0) {
if (DBG) log("resetConnections(" + iface + ", " + resetMask + ")"); if (DBG) log("resetConnections(" + iface + ", " + resetMask + ")");
@@ -2281,6 +2281,7 @@ public class ConnectivityService extends IConnectivityManager.Stub {
} }
} }
} }
}
// Update 464xlat state. // Update 464xlat state.
// TODO: Move to handleConnect() // TODO: Move to handleConnect()