commit 83b1fc9643ab84b20915f8e90cff436050772164
author Robert Greenwalt <rgreenwalt@google.com> Fri Jan 20 14:35:41 2012 -0800
committer Android (Google) Code Review <android-gerrit@google.com> Fri Jan 20 14:35:41 2012 -0800
tree 7a2428544dd7ce1789d3968a080b6b0c6d6cf695
parent 6ed1f684fd4941d1a37b1a374bae5b957eb5162a
parent 7fa3bdb7467b91a1fa262220dd556e4d6a1179d9

Merge "Stop using shared DUN APN when tethering stops."

core/jni/android_net_NetUtils.cpp

diff --git a/core/jni/android_net_NetUtils.cpp b/core/jni/android_net_NetUtils.cpp
index d9bd50e..724d9fb 100644
--- a/core/jni/android_net_NetUtils.cpp
+++ b/core/jni/android_net_NetUtils.cpp
@@ -97,7 +97,7 @@
 
     const char *nameStr = env->GetStringUTFChars(ifname, NULL);
 
-    LOGD("android_net_utils_resetConnections in env=%p clazz=%p iface=%s mask=0x%x\n",
+    ALOGD("android_net_utils_resetConnections in env=%p clazz=%p iface=%s mask=0x%x\n",
           env, clazz, nameStr, mask);
 
     result = ::ifc_reset_connections(nameStr, mask);

services/java/com/android/server/ConnectivityService.java

diff --git a/services/java/com/android/server/ConnectivityService.java b/services/java/com/android/server/ConnectivityService.java
index 4b5c4a1..b7dc4a2 100644
--- a/services/java/com/android/server/ConnectivityService.java
+++ b/services/java/com/android/server/ConnectivityService.java
@@ -1445,6 +1445,12 @@
             }
             mNetTrackers[ConnectivityManager.TYPE_MOBILE].setUserDataEnable(enabled);
         }
+        if (mNetTrackers[ConnectivityManager.TYPE_WIMAX] != null) {
+            if (VDBG) {
+                log(mNetTrackers[ConnectivityManager.TYPE_WIMAX].toString() + enabled);
+            }
+            mNetTrackers[ConnectivityManager.TYPE_WIMAX].setUserDataEnable(enabled);
+        }
     }
 
     @Override