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

am 44f64c96: Merge "Filter our v6 address from tethering dns." into ics-mr1

Browse Source 
* commit '44f64c965776ae65ff85ef8c37afb7e14483bdf2':
  Filter our v6 address from tethering dns.
This commit is contained in:
Robert Greenwalt
2012-01-25 11:30:39 -08:00
committed by Android Git Automerger
parent 95306d8500 44f64c9657
commit 1095335191
1 changed files with 14 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
services/java/com/android/server/connectivity/Tethering.java
View File

@@ -55,6 +55,7 @@ import com.google.android.collect.Lists;
import java.io.FileDescriptor; import java.io.FileDescriptor;
import java.io.PrintWriter; import java.io.PrintWriter;
import java.net.InetAddress; import java.net.InetAddress;
import java.net.Inet4Address;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Collection; import java.util.Collection;
import java.util.HashMap; import java.util.HashMap;
@@ -1326,7 +1327,17 @@ public class Tethering extends INetworkManagementEventObserver.Stub {
String[] dnsServers = mDefaultDnsServers; String[] dnsServers = mDefaultDnsServers;
Collection<InetAddress> dnses = linkProperties.getDnses(); Collection<InetAddress> dnses = linkProperties.getDnses();
if (dnses != null) { if (dnses != null) {
dnsServers = NetworkUtils.makeStrings(dnses); // we currently only handle IPv4
ArrayList<InetAddress> v4Dnses =
new ArrayList<InetAddress>(dnses.size());
for (InetAddress dnsAddress : dnses) {
if (dnsAddress instanceof Inet4Address) {
v4Dnses.add(dnsAddress);
}
}
if (v4Dnses.size() > 0) {
dnsServers = NetworkUtils.makeStrings(v4Dnses);
}
} }
try { try {
mNMService.setDnsForwarders(dnsServers); mNMService.setDnsForwarders(dnsServers);
@@ -1384,11 +1395,12 @@ public class Tethering extends INetworkManagementEventObserver.Stub {
boolean mTryCell = !WAIT_FOR_NETWORK_TO_SETTLE; boolean mTryCell = !WAIT_FOR_NETWORK_TO_SETTLE;
@Override @Override
public void enter() { public void enter() {
turnOnMasterTetherSettings(); // may transition us out
mTryCell = !WAIT_FOR_NETWORK_TO_SETTLE; // better try something first pass mTryCell = !WAIT_FOR_NETWORK_TO_SETTLE; // better try something first pass
// or crazy tests cases will fail // or crazy tests cases will fail
chooseUpstreamType(mTryCell); chooseUpstreamType(mTryCell);
mTryCell = !mTryCell; mTryCell = !mTryCell;
turnOnMasterTetherSettings(); // may transition us out
} }
@Override @Override
public void exit() { public void exit() {