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

Merge "Fix for updating TCP buffer size when switching network type"

Browse Source
This commit is contained in:
Robert Greenwalt
2012-08-17 13:01:49 -07:00
committed by android code review
parent a688af9c67 1968256926
commit 6626398a72
3 changed files with 22 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -184,8 +184,17 @@ public class MobileDataStateTracker implements NetworkStateTracker {
if (!TextUtils.equals(apnType, mApnType)) {
return;
}
mNetworkInfo.setSubtype(TelephonyManager.getDefault().getNetworkType(),
TelephonyManager.getDefault().getNetworkTypeName());
int oldSubtype = mNetworkInfo.getSubtype();
int newSubType = TelephonyManager.getDefault().getNetworkType();
String subTypeName = TelephonyManager.getDefault().getNetworkTypeName();
mNetworkInfo.setSubtype(newSubType, subTypeName);
if (newSubType != oldSubtype && mNetworkInfo.isConnected()) {
Message msg = mTarget.obtainMessage(EVENT_NETWORK_SUBTYPE_CHANGED,
oldSubtype, 0, mNetworkInfo);
msg.sendToTarget();
}
PhoneConstants.DataState state = Enum.valueOf(PhoneConstants.DataState.class,
intent.getStringExtra(PhoneConstants.STATE_KEY));
String reason = intent.getStringExtra(PhoneConstants.STATE_CHANGE_REASON_KEY);

6
core/java/android/net/NetworkStateTracker.java
View File

@@ -68,6 +68,12 @@ public interface NetworkStateTracker {
*/
public static final int EVENT_RESTORE_DEFAULT_NETWORK = 6;
/**
* msg.what = EVENT_NETWORK_SUBTYPE_CHANGED
* msg.obj = NetworkInfo object
*/
public static final int EVENT_NETWORK_SUBTYPE_CHANGED = 7;
/**
* -------------------------------------------------------------
* Control Interface

5
services/java/com/android/server/ConnectivityService.java
View File

@@ -2490,6 +2490,11 @@ private NetworkStateTracker makeWimaxStateTracker() {
// @see bug/4455071
handleConnectivityChange(info.getType(), false);
break;
case NetworkStateTracker.EVENT_NETWORK_SUBTYPE_CHANGED:
info = (NetworkInfo) msg.obj;
type = info.getType();
updateNetworkSettings(mNetTrackers[type]);
break;
case EVENT_CLEAR_NET_TRANSITION_WAKELOCK:
String causedBy = null;
synchronized (ConnectivityService.this) {