From e41e3b3c09f606ec94bd24dd3b595d3c648bb717 Mon Sep 17 00:00:00 2001 From: Robert Greenwalt Date: Mon, 11 Feb 2013 15:25:10 -0800 Subject: [PATCH] Reintroduce the net.dns system properties Removing these properties broke video playback as they used a custom dns resolver. We'll work together to resolve our resolver issues in the future, but this was the easy fix to get things working again. bug:8173236 Change-Id: I687dae59eda4fc449efc34eed11c3dc88a110ad0 --- .../java/com/android/server/ConnectivityService.java | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/services/java/com/android/server/ConnectivityService.java b/services/java/com/android/server/ConnectivityService.java index fb81391edd..6efe4c5842 100644 --- a/services/java/com/android/server/ConnectivityService.java +++ b/services/java/com/android/server/ConnectivityService.java @@ -200,6 +200,7 @@ public class ConnectivityService extends IConnectivityManager.Stub { private int mDefaultConnectionSequence = 0; private Object mDnsLock = new Object(); + private int mNumDnsEntries; private boolean mDnsOverridden = false; private boolean mTestMode; @@ -2479,6 +2480,17 @@ public class ConnectivityService extends IConnectivityManager.Stub { try { mNetd.setDnsServersForInterface(iface, NetworkUtils.makeStrings(dnses), domains); mNetd.setDefaultInterfaceForDns(iface); + for (InetAddress dns : dnses) { + ++last; + String key = "net.dns" + last; + String value = dns.getHostAddress(); + SystemProperties.set(key, value); + } + for (int i = last + 1; i <= mNumDnsEntries; ++i) { + String key = "net.dns" + i; + SystemProperties.set(key, ""); + } + mNumDnsEntries = last; } catch (Exception e) { if (DBG) loge("exception setting default dns interface: " + e); }