Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1a1ee224 authored by Robert Greenwalt's avatar Robert Greenwalt Committed by Android Git Automerger
Browse files

am bb1d9847: am 80bb8d29: Merge "Update TCP buffer size when switching network... 

am bb1d9847: am 80bb8d29: Merge "Update TCP buffer size when switching network type" into jb-mr1-dev

* commit 'bb1d9847':
  Update TCP buffer size when switching network type
parents 44b7a50f bb1d9847

core/java/android/net/MobileDataStateTracker.java

+11 −2
Original line number Diff line number Diff line
@@ -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);

core/java/android/net/NetworkStateTracker.java

+6 −0
Original line number Diff line number Diff line
@@ -62,6 +62,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

services/java/com/android/server/ConnectivityService.java

+5 −0
Original line number Diff line number Diff line
@@ -2594,6 +2594,11 @@ public class ConnectivityService extends IConnectivityManager.Stub { 
                    //       @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;

            }

        }

    }