am 61db35da: am 2f835a61: Merge "Make copies of NetworkInfo to give out." into honeycomb-LTE

* commit '61db35da':
  Make copies of NetworkInfo to give out.

core/java/android/net/MobileDataStateTracker.java

@@ -394,7 +394,7 @@ public class MobileDataStateTracker implements NetworkStateTracker {
                     && lastReason != null)
                 reason = lastReason;
             mNetworkInfo.setDetailedState(state, reason, extraInfo);
-            Message msg = mTarget.obtainMessage(EVENT_STATE_CHANGED, mNetworkInfo);
+            Message msg = mTarget.obtainMessage(EVENT_STATE_CHANGED, new NetworkInfo(mNetworkInfo));
             msg.sendToTarget();
         }
     }

wifi/java/android/net/wifi/WifiStateTracker.java

@@ -162,7 +162,7 @@ public class WifiStateTracker implements NetworkStateTracker {
      * Fetch NetworkInfo for the network
      */
     public NetworkInfo getNetworkInfo() {
-        return mNetworkInfo;
+        return new NetworkInfo(mNetworkInfo);
     }
 
     /**
@@ -242,7 +242,8 @@ public class WifiStateTracker implements NetworkStateTracker {
                 } else {
                     mLastState = state;
                 }
-                Message msg = mCsHandler.obtainMessage(EVENT_STATE_CHANGED, mNetworkInfo);
+                Message msg = mCsHandler.obtainMessage(EVENT_STATE_CHANGED,
+                        new NetworkInfo(mNetworkInfo));
                 msg.sendToTarget();
             } else if (intent.getAction().equals(WifiManager.LINK_CONFIGURATION_CHANGED_ACTION)) {
                 mLinkProperties = (LinkProperties) intent.getParcelableExtra(