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

Commit 135ce948 authored by Jack Yu's avatar Jack Yu Committed by android-build-merger
Browse files

Merge "Cleaned up data enable code" am: 144d04e4 am: 485aebbb 

am: 672f13aa

Change-Id: I89bd0a8da5f01ab272134bd40907705dc30d724a
parents ba7ca642 672f13aa

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

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

                mMeteredApnEnabledLog.log("SET_METERED_APNS_ENABLED: "

                        + mCarrierActionOnMeteredApnEnabled);

                int otaspState = (mCarrierActionOnMeteredApnEnabled)

                        ? mPhone.getServiceStateTracker().getOtasp()

                        : TelephonyManager.OTASP_SIM_UNPROVISIONED;

                mPhone.notifyOtaspChanged(otaspState);

                mMeteredApnEnableRegistrants.notifyRegistrants(

                        new AsyncResult(null, mCarrierActionOnMeteredApnEnabled, null));

                break;

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

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

        if (mDataEnabledSettings.isUserDataEnabled() != 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);



            // TODO: We should register for DataEnabledSetting's data enabled/disabled event and
@@ -2195,16 +2187,10 @@ public class DcTracker extends Handler { 
            mDataEnabledSettings.setCarrierDataEnabled(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

                cleanUpAllConnectionsInternal(true,

                        Phone.REASON_CARRIER_ACTION_DISABLE_METERED_APN);

            } else {

                // Re-evaluate Otasp state

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

                mPhone.notifyOtaspChanged(otaspState);



                reevaluateDataConnections();

                setupDataOnConnectableApns(Phone.REASON_DATA_ENABLED);

            }