Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(262)

Unified Diff: net/dns/dns_config_service_posix.cc

Issue 1294883002: Revert of [Android] Add a java.lang.System wrapper. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: net/dns/dns_config_service_posix.cc
diff --git a/net/dns/dns_config_service_posix.cc b/net/dns/dns_config_service_posix.cc
index b6ab022e0cca0abd7a0f7b1e6fb8c9099d24a633..02877e78e1db39b195a690aa5a934548efa80072 100644
--- a/net/dns/dns_config_service_posix.cc
+++ b/net/dns/dns_config_service_posix.cc
@@ -30,7 +30,7 @@
#endif
#if defined(OS_ANDROID)
-#include "base/android/java_system.h"
+#include <sys/system_properties.h>
#include "net/base/network_change_notifier.h"
#endif
@@ -154,14 +154,22 @@
return result;
}
#else // defined(OS_ANDROID)
-// Theoretically, this is bad. The DNS system properties are implementation
-// details that may disappear in future Android releases. Practically, the DNS
-// code (and its clients) are already robust against failing to get the DNS
+// Theoretically, this is bad. __system_property_get is not a supported API
+// (but it's currently visible to anyone using Bionic), and the properties
+// are implementation details that may disappear in future Android releases.
+// Practically, libcutils provides property_get, which is a public API, and the
+// DNS code (and its clients) are already robust against failing to get the DNS
// config for whatever reason, so the properties can disappear and the world
// won't end.
+// TODO(ttuttle): Depend on libcutils, then switch this (and other uses of
+// __system_property_get) to property_get.
ConfigParsePosixResult ReadDnsConfig(DnsConfig* dns_config) {
- std::string dns1_string = base::android::JavaSystem::GetProperty("net.dns1");
- std::string dns2_string = base::android::JavaSystem::GetProperty("net.dns2");
+ std::string dns1_string, dns2_string;
+ char property_value[PROP_VALUE_MAX];
+ __system_property_get("net.dns1", property_value);
+ dns1_string = property_value;
+ __system_property_get("net.dns2", property_value);
+ dns2_string = property_value;
if (dns1_string.length() == 0 && dns2_string.length() == 0)
return CONFIG_PARSE_POSIX_NO_NAMESERVERS;
« no previous file with comments | « net/android/java/src/org/chromium/net/ProxyChangeListener.java ('k') | net/proxy/proxy_config_service_android.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698