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

Commit 8b494f94 authored by Sarah Chin's avatar Sarah Chin
Browse files

Update DC mUnmeteredOverride in DcActiveState 

Needs to update value so getNetworkCapabilities() correctly evaluates
meteredness
Moved NetworkAgent-dependent code from DcDefaultState to DcActiveState

Test: atest DcTrackerTest, DataConnectionTest, SubscriptionManagerTest
Bug: 150427710
Bug: 150417209
Change-Id: I01b7496334bd1fc8274d0c6a2de6cbc39f3f4931
parent 8e289860

src/java/com/android/internal/telephony/dataconnection/DataConnection.java

+30 −32
Original line number Original line Diff line number Diff line
@@ -1656,37 +1656,6 @@ public class DataConnection extends StateMachine { 
                                + " drs=" + mDataRegState

                                + " drs=" + mDataRegState

                                + " mRilRat=" + mRilRat);

                                + " mRilRat=" + mRilRat);

                    }

                    }

                    updateNetworkInfoSuspendState();

                    if (mNetworkAgent != null) {

                        mNetworkAgent.sendNetworkCapabilities(getNetworkCapabilities(),

                                DataConnection.this);

                        mNetworkAgent.sendNetworkInfo(mNetworkInfo, DataConnection.this);

                        mNetworkAgent.sendLinkProperties(mLinkProperties, DataConnection.this);

                    }

                    break;

                case EVENT_DATA_CONNECTION_METEREDNESS_CHANGED:

                    boolean isUnmetered = (boolean) msg.obj;

                    if (isUnmetered == mUnmeteredOverride) {

                        break;

                    }

                    mUnmeteredOverride = isUnmetered;

                    // fallthrough

                case EVENT_NR_FREQUENCY_CHANGED:

                case EVENT_DATA_CONNECTION_ROAM_ON:

                case EVENT_DATA_CONNECTION_ROAM_OFF:

                case EVENT_DATA_CONNECTION_OVERRIDE_CHANGED:

                    if (mNetworkAgent != null) {

                        mNetworkAgent.sendNetworkCapabilities(getNetworkCapabilities(),

                                DataConnection.this);

                        mNetworkAgent.sendNetworkInfo(mNetworkInfo, DataConnection.this);

                    }

                    break;

                case EVENT_KEEPALIVE_START_REQUEST:

                case EVENT_KEEPALIVE_STOP_REQUEST:

                    if (mNetworkAgent != null) {

                        mNetworkAgent.sendSocketKeepaliveEvent(

                                msg.arg1, SocketKeepalive.ERROR_INVALID_NETWORK);

                    }

                    break;

                    break;

                default:

                default:

                    if (DBG) {

                    if (DBG) {
@@ -2261,9 +2230,38 @@ public class DataConnection extends StateMachine { 
                    retVal = HANDLED;

                    retVal = HANDLED;

                    break;

                    break;

                }

                }

                case EVENT_DATA_CONNECTION_DRS_OR_RAT_CHANGED: {

                    AsyncResult ar = (AsyncResult) msg.obj;

                    Pair<Integer, Integer> drsRatPair = (Pair<Integer, Integer>) ar.result;

                    mDataRegState = drsRatPair.first;

                    updateTcpBufferSizes(drsRatPair.second);

                    mRilRat = drsRatPair.second;

                    if (DBG) {

                        log("DcActiveState: EVENT_DATA_CONNECTION_DRS_OR_RAT_CHANGED"

                                + " drs=" + mDataRegState

                                + " mRilRat=" + mRilRat);

                    }

                    updateNetworkInfoSuspendState();

                    if (mNetworkAgent != null) {

                        mNetworkAgent.sendNetworkCapabilities(getNetworkCapabilities(),

                                DataConnection.this);

                        mNetworkAgent.sendNetworkInfo(mNetworkInfo, DataConnection.this);

                        mNetworkAgent.sendLinkProperties(mLinkProperties, DataConnection.this);

                    }

                    retVal = HANDLED;

                    break;

                }

                case EVENT_DATA_CONNECTION_METEREDNESS_CHANGED:

                    boolean isUnmetered = (boolean) msg.obj;

                    if (isUnmetered == mUnmeteredOverride) {

                        retVal = HANDLED;

                        break;

                    }

                    mUnmeteredOverride = isUnmetered;

                    // fallthrough

                case EVENT_NR_FREQUENCY_CHANGED:

                case EVENT_DATA_CONNECTION_ROAM_ON:

                case EVENT_DATA_CONNECTION_ROAM_ON:

                case EVENT_DATA_CONNECTION_ROAM_OFF:

                case EVENT_DATA_CONNECTION_ROAM_OFF:

                case EVENT_DATA_CONNECTION_METEREDNESS_CHANGED:

                case EVENT_DATA_CONNECTION_OVERRIDE_CHANGED: {

                case EVENT_DATA_CONNECTION_OVERRIDE_CHANGED: {

                    if (mNetworkAgent != null) {

                    if (mNetworkAgent != null) {

                        mNetworkAgent.sendNetworkCapabilities(getNetworkCapabilities(),

                        mNetworkAgent.sendNetworkCapabilities(getNetworkCapabilities(),