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

Add a default dns entry if none is provided

Browse Source 
Fixes part of emulator which isn't telling us about dns servers.
Gets some stuff running, but browser is still broken.

bug:2961703
Change-Id: I53b946eba434aca1bb524c2acaf77922377948d1
This commit is contained in:
Robert Greenwalt
2010-09-01 11:34:05 -07:00
parent 7323ea10cd
commit 94daa185b8
1 changed files with 27 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -121,6 +121,8 @@ public class ConnectivityService extends IConnectivityManager.Stub {
private int mNetTransitionWakeLockSerialNumber; private int mNetTransitionWakeLockSerialNumber;
private int mNetTransitionWakeLockTimeout; private int mNetTransitionWakeLockTimeout;
private InetAddress mDefaultDns;
private static class NetworkAttributes { private static class NetworkAttributes {
/** /**
* Class for holding settings read from resources. * Class for holding settings read from resources.
@@ -209,6 +211,19 @@ public class ConnectivityService extends IConnectivityManager.Stub {
SystemProperties.set("net.hostname", name); SystemProperties.set("net.hostname", name);
} }
// read our default dns server ip
String dns = Settings.Secure.getString(context.getContentResolver(),
Settings.Secure.DEFAULT_DNS_SERVER);
if (dns == null || dns.length() == 0) {
dns = context.getResources().getString(
com.android.internal.R.string.config_default_dns_server);
}
try {
mDefaultDns = InetAddress.getByName(dns);
} catch (UnknownHostException e) {
Slog.e(TAG, "Error setting defaultDns using " + dns);
}
mContext = context; mContext = context;
PowerManager powerManager = (PowerManager)mContext.getSystemService(Context.POWER_SERVICE); PowerManager powerManager = (PowerManager)mContext.getSystemService(Context.POWER_SERVICE);
@@ -1468,6 +1483,13 @@ public class ConnectivityService extends IConnectivityManager.Stub {
Collection<InetAddress> dnses = p.getDnses(); Collection<InetAddress> dnses = p.getDnses();
if (mNetAttributes[netType].isDefault()) { if (mNetAttributes[netType].isDefault()) {
int j = 1; int j = 1;
if (dnses.size() == 0 && mDefaultDns != null) {
if (DBG) {
Slog.d(TAG, "no dns provided - using " + mDefaultDns.getHostAddress());
}
SystemProperties.set("net.dns1", mDefaultDns.getHostAddress());
j++;
} else {
for (InetAddress dns : dnses) { for (InetAddress dns : dnses) {
if (DBG) { if (DBG) {
Slog.d(TAG, "adding dns " + dns + " for " + Slog.d(TAG, "adding dns " + dns + " for " +
@@ -1475,6 +1497,7 @@ public class ConnectivityService extends IConnectivityManager.Stub {
} }
SystemProperties.set("net.dns" + j++, dns.getHostAddress()); SystemProperties.set("net.dns" + j++, dns.getHostAddress());
} }
}
for (int k=j ; k<mNumDnsEntries; k++) { for (int k=j ; k<mNumDnsEntries; k++) {
if (DBG) Slog.d(TAG, "erasing net.dns" + k); if (DBG) Slog.d(TAG, "erasing net.dns" + k);
SystemProperties.set("net.dns" + k, ""); SystemProperties.set("net.dns" + k, "");