commit 3f2f58e9d5d686738843d68e46676471c288b025
author Wink Saville <wink@google.com> Thu Jun 23 18:25:38 2011 -0700
committer Android Git Automerger <android-git-automerger@android.com> Thu Jun 23 18:25:38 2011 -0700
tree dd544c23caac71698bd96a007374ba973b6ebba9
parent 7fb0b2856f30677a87425f9430ce81395d0e861b
parent 0768006559929dd2020e31b32da03f417b13e7fb

am f49e4d3f: Merge "Temporary re-enabling iface name change handling on HO" into honeycomb-LTE

* commit 'f49e4d3f182071081537dba3387db20cae27c427':
  Temporary re-enabling iface name change handling on HO

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 c829ce7..100882f 100644
--- a/services/java/com/android/server/ConnectivityService.java
+++ b/services/java/com/android/server/ConnectivityService.java
@@ -1454,6 +1454,16 @@
                 }
             }
         }
+
+        // TODO: Temporary notifying upstread change to Tethering.
+        //       @see bug/4455071
+        /** Notify TetheringService if interface name has been changed. */
+        if (TextUtils.equals(mNetTrackers[netType].getNetworkInfo().getReason(),
+                             Phone.REASON_LINK_PROPERTIES_CHANGED)) {
+            if (isTetheringSupported()) {
+                mTethering.handleTetherIfaceChange();
+            }
+        }
     }
 
     private void addPrivateDnsRoutes(NetworkStateTracker nt) {
@@ -1896,7 +1906,10 @@
                     break;
                 case NetworkStateTracker.EVENT_CONFIGURATION_CHANGED:
                     info = (NetworkInfo) msg.obj;
-                    handleConnectivityChange(info.getType(), true);
+                    // TODO: Temporary allowing network configuration
+                    //       change not resetting sockets.
+                    //       @see bug/4455071
+                    handleConnectivityChange(info.getType(), false);
                     break;
                 case EVENT_CLEAR_NET_TRANSITION_WAKELOCK:
                     String causedBy = null;