summaryrefslogtreecommitdiffstats
path: root/services
diff options
context:
space:
mode:
authorrepo sync <isheriff@google.com>2011-08-02 14:48:43 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2011-08-02 14:48:43 -0700
commit7374d9728bd0e8847bab723608ebab3542e8157e (patch)
tree5ceb97aa6ad1e1f66d27023884d634c2ca52a00a /services
parentc8909501b1ec52e7f2e7e052b277f83d8693dbeb (diff)
parent8935696a19822283212591917f04e4b91b5b9219 (diff)
downloadframeworks_base-7374d9728bd0e8847bab723608ebab3542e8157e.zip
frameworks_base-7374d9728bd0e8847bab723608ebab3542e8157e.tar.gz
frameworks_base-7374d9728bd0e8847bab723608ebab3542e8157e.tar.bz2
Merge "Fix networktype on per process DNS setting"
Diffstat (limited to 'services')
-rw-r--r--services/java/com/android/server/ConnectivityService.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/services/java/com/android/server/ConnectivityService.java b/services/java/com/android/server/ConnectivityService.java
index 2a724d4..541a8cf 100644
--- a/services/java/com/android/server/ConnectivityService.java
+++ b/services/java/com/android/server/ConnectivityService.java
@@ -900,7 +900,7 @@ public class ConnectivityService extends IConnectivityManager.Stub {
!network.isTeardownRequested()) {
if (ni.isConnected() == true) {
// add the pid-specific dns
- handleDnsConfigurationChange(networkType);
+ handleDnsConfigurationChange(usedNetworkType);
if (DBG) log("special network already active");
return Phone.APN_ALREADY_ACTIVE;
}