commit efaa396ae9a4ce601c9b885ecd76686906a1bae6
author Wink Saville <wink@google.com> Mon Jun 27 14:14:45 2011 -0700
committer Android Git Automerger <android-git-automerger@android.com> Mon Jun 27 14:14:45 2011 -0700
tree 4a9850e5fb18e0b3eeb490a149884e223be5e645
parent e7bfeb3d77d1bd43fad1a23964f29b8cbf24cef1
parent 3f2f58e9d5d686738843d68e46676471c288b025

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

* commit '3f2f58e9d5d686738843d68e46676471c288b025':
  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 8ac8f2b..8fb6274 100644
--- a/services/java/com/android/server/ConnectivityService.java
+++ b/services/java/com/android/server/ConnectivityService.java
@@ -1610,6 +1610,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) {
@@ -2035,7 +2045,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;