drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Filter our v6 address from tethering dns.

Browse Source 
Don't support IPv6 yet, and the tools crash when they see one, so
filter them out.

bug:5913888
Change-Id: Id7096aa70da4e3cc8e4702b0b489c0228a100db9
This commit is contained in:
Robert Greenwalt
2011-12-19 16:59:31 -08:00
parent 185c0ef7e4
commit 03d58bc656
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.PrintWriter;
import java.net.InetAddress;
import java.net.Inet4Address;
import java.util.ArrayList;
import java.util.Collection;
import java.util.HashMap;
@ -1326,7 +1327,17 @@ public class Tethering extends INetworkManagementEventObserver.Stub {
String[] dnsServers = mDefaultDnsServers;
Collection<InetAddress> dnses = linkProperties.getDnses();
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 {
mNMService.setDnsForwarders(dnsServers);
@ -1384,11 +1395,12 @@ public class Tethering extends INetworkManagementEventObserver.Stub {
boolean mTryCell = !WAIT_FOR_NETWORK_TO_SETTLE;
@Override
public void enter() {
turnOnMasterTetherSettings(); // may transition us out
mTryCell = !WAIT_FOR_NETWORK_TO_SETTLE; // better try something first pass
// or crazy tests cases will fail
chooseUpstreamType(mTryCell);
mTryCell = !mTryCell;
turnOnMasterTetherSettings(); // may transition us out
}
@Override
public void exit() {