summaryrefslogtreecommitdiffstats
path: root/core/java/android/provider
diff options
context:
space:
mode:
authorRobert Greenwalt <rgreenwalt@google.com>2010-09-01 11:34:05 -0700
committerRobert Greenwalt <rgreenwalt@google.com>2010-09-01 15:25:51 -0700
commite90aa5e97e3a5502a8334ed6ceb98305f6e01361 (patch)
tree1dc469b39c929858f7e0d023a4c981c46c771142 /core/java/android/provider
parent276e8d44a4e29c86712c3ccb60dc8dc057b209d0 (diff)
downloadframeworks_base-e90aa5e97e3a5502a8334ed6ceb98305f6e01361.zip
frameworks_base-e90aa5e97e3a5502a8334ed6ceb98305f6e01361.tar.gz
frameworks_base-e90aa5e97e3a5502a8334ed6ceb98305f6e01361.tar.bz2
Add a default dns entry if none is provided
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
Diffstat (limited to 'core/java/android/provider')
-rw-r--r--core/java/android/provider/Settings.java6
1 files changed, 6 insertions, 0 deletions
diff --git a/core/java/android/provider/Settings.java b/core/java/android/provider/Settings.java
index d1ca723..158558e 100644
--- a/core/java/android/provider/Settings.java
+++ b/core/java/android/provider/Settings.java
@@ -2385,6 +2385,12 @@ public final class Settings {
public static final String SET_GLOBAL_HTTP_PROXY = "set_global_http_proxy";
/**
+ * Setting for default DNS in case nobody suggests one
+ * @hide
+ */
+ public static final String DEFAULT_DNS_SERVER = "default_dns_server";
+
+ /**
* Whether the package installer should allow installation of apps downloaded from
* sources other than the Android Market (vending machine).
*