Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
* commit '61db35da2b4501dde5646f86f21cf5054c41ea26':
  Make copies of NetworkInfo to give out.
This commit is contained in:
Robert Greenwalt
2011-09-13 14:25:27 -07:00
committed by Android Git Automerger
parent 0042330e3b 61db35da2b
commit 2367e75bee
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/java/android/net/MobileDataStateTracker.java
View File

@@ -394,7 +394,7 @@ public class MobileDataStateTracker implements NetworkStateTracker {
&& lastReason != null) && lastReason != null)
reason = lastReason; reason = lastReason;
mNetworkInfo.setDetailedState(state, reason, extraInfo); 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(); msg.sendToTarget();
} }
} }

5
wifi/java/android/net/wifi/WifiStateTracker.java
View File

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