1 files changed, 2 insertions, 2 deletions
diff --git a/services/java/com/android/server/ConnectivityService.java b/services/java/com/android/server/ConnectivityService.java
index 0843948..2a724d4 100644
--- a/services/java/com/android/server/ConnectivityService.java
+++ b/services/java/com/android/server/ConnectivityService.java
@@ -1995,7 +1995,7 @@ public class ConnectivityService extends IConnectivityManager.Stub {
                 }
             } else {
                 try {
-                    mNetd.setDnsServersForInterface(Integer.toString(netType),
+                    mNetd.setDnsServersForInterface(p.getInterfaceName(),
                             NetworkUtils.makeStrings(dnses));
                 } catch (Exception e) {
                     Slog.e(TAG, "exception setting dns servers: " + e);
@@ -2484,7 +2484,7 @@ public class ConnectivityService extends IConnectivityManager.Stub {
         synchronized (this) {
             if (mDefaultProxy != null && mDefaultProxy.equals(proxy)) return;
             if (mDefaultProxy == proxy) return;
-            if (!TextUtils.isEmpty(proxy.getHost())) {
+            if (proxy != null && !TextUtils.isEmpty(proxy.getHost())) {
                 mDefaultProxy = proxy;
             } else {
                 mDefaultProxy = null;