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

Commit 144d04e4 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "Cleaned up data enable code"

parents 2dd4daa3 89bce0b5

src/java/com/android/internal/telephony/CarrierActionAgent.java

+4 −0
Original line number Original line Diff line number Diff line
@@ -118,6 +118,10 @@ public class CarrierActionAgent extends Handler { 
                log("SET_METERED_APNS_ENABLED: " + mCarrierActionOnMeteredApnEnabled);

                log("SET_METERED_APNS_ENABLED: " + mCarrierActionOnMeteredApnEnabled);

                mMeteredApnEnabledLog.log("SET_METERED_APNS_ENABLED: "

                mMeteredApnEnabledLog.log("SET_METERED_APNS_ENABLED: "

                        + mCarrierActionOnMeteredApnEnabled);

                        + mCarrierActionOnMeteredApnEnabled);

                int otaspState = (mCarrierActionOnMeteredApnEnabled)

                        ? mPhone.getServiceStateTracker().getOtasp()

                        : TelephonyManager.OTASP_SIM_UNPROVISIONED;

                mPhone.notifyOtaspChanged(otaspState);

                mMeteredApnEnableRegistrants.notifyRegistrants(

                mMeteredApnEnableRegistrants.notifyRegistrants(

                        new AsyncResult(null, mCarrierActionOnMeteredApnEnabled, null));

                        new AsyncResult(null, mCarrierActionOnMeteredApnEnabled, null));

                break;

                break;

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

+0 −14
Original line number Original line Diff line number Diff line
@@ -783,14 +783,6 @@ public class DcTracker extends Handler { 
    private void onSetUserDataEnabled(boolean enabled) {

    private void onSetUserDataEnabled(boolean enabled) {

        if (mDataEnabledSettings.isUserDataEnabled() != enabled) {

        if (mDataEnabledSettings.isUserDataEnabled() != enabled) {

            mDataEnabledSettings.setUserDataEnabled(enabled);

            mDataEnabledSettings.setUserDataEnabled(enabled);

            if (!getDataRoamingEnabled() && mPhone.getServiceState().getDataRoaming()) {

                if (enabled) {

                    notifyOffApnsOfAvailability(Phone.REASON_ROAMING_ON);

                } else {

                    notifyOffApnsOfAvailability(Phone.REASON_DATA_DISABLED);

                }

            }



            mPhone.notifyUserMobileDataStateChanged(enabled);

            mPhone.notifyUserMobileDataStateChanged(enabled);





            // TODO: We should register for DataEnabledSetting's data enabled/disabled event and

            // TODO: We should register for DataEnabledSetting's data enabled/disabled event and
@@ -2188,16 +2180,10 @@ public class DcTracker extends Handler { 
            mDataEnabledSettings.setCarrierDataEnabled(enabled);

            mDataEnabledSettings.setCarrierDataEnabled(enabled);





            if (!enabled) {

            if (!enabled) {

                // Send otasp_sim_unprovisioned so that SuW is able to proceed and notify users

                mPhone.notifyOtaspChanged(TelephonyManager.OTASP_SIM_UNPROVISIONED);

                // Tear down all metered apns

                // Tear down all metered apns

                cleanUpAllConnectionsInternal(true,

                cleanUpAllConnectionsInternal(true,

                        Phone.REASON_CARRIER_ACTION_DISABLE_METERED_APN);

                        Phone.REASON_CARRIER_ACTION_DISABLE_METERED_APN);

            } else {

            } else {

                // Re-evaluate Otasp state

                int otaspState = mPhone.getServiceStateTracker().getOtasp();

                mPhone.notifyOtaspChanged(otaspState);



                reevaluateDataConnections();

                reevaluateDataConnections();

                setupDataOnConnectableApns(Phone.REASON_DATA_ENABLED);

                setupDataOnConnectableApns(Phone.REASON_DATA_ENABLED);

            }

            }