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

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

Browse Source 
* commit '2f835a6193c14e27cf761d85ac3ea4c9bd9296f8':
  Make copies of NetworkInfo to give out.
This commit is contained in:
Robert Greenwalt
2011-09-09 15:52:42 -07:00
committed by Android Git Automerger
parent 30928eb603 2f835a6193
commit 61db35da2b
3 changed files with 21 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

@@ -386,7 +386,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();
}
}

17
core/java/android/net/NetworkInfo.java
View File

@@ -138,6 +138,23 @@ public class NetworkInfo implements Parcelable {
mIsRoaming = false;
}
/** {@hide} */
public NetworkInfo(NetworkInfo source) {
if (source != null) {
mNetworkType = source.mNetworkType;
mSubtype = source.mSubtype;
mTypeName = source.mTypeName;
mSubtypeName = source.mSubtypeName;
mState = source.mState;
mDetailedState = source.mDetailedState;
mReason = source.mReason;
mExtraInfo = source.mExtraInfo;
mIsFailover = source.mIsFailover;
mIsRoaming = source.mIsRoaming;
mIsAvailable = source.mIsAvailable;
}
}
/**
* Reports the type of network (currently mobile or Wi-Fi) to which the
* info in this object pertains.

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

@@ -160,7 +160,7 @@ public class WifiStateTracker implements NetworkStateTracker {
* Fetch NetworkInfo for the network
*/
public NetworkInfo getNetworkInfo() {
return mNetworkInfo;
return new NetworkInfo(mNetworkInfo);
}
/**
@@ -226,7 +226,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(