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

Commit 1e14e802 authored by Meng Wang's avatar Meng Wang Committed by android-build-merger
Browse files

Merge "support vzw roaming default on" into pi-dev am: f7651d67 

am: 67d97dd2

Change-Id: I9007e0d5fee49fa52239372b6f2829b67c4bc67b
parents 26ef1983 67d97dd2

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

+1 −1
Original line number Diff line number Diff line
@@ -221,7 +221,7 @@ public class CarrierActionAgent extends Handler { 
        sendMessage(obtainMessage(CARRIER_ACTION_REPORT_DEFAULT_NETWORK_STATUS, report));

    }



    private void carrierActionReset() {

    public void carrierActionReset() {

        carrierActionReportDefaultNetworkStatus(false);

        carrierActionSetMeteredApnsEnabled(true);

        carrierActionSetRadioEnabled(true);

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

+7 −0
Original line number Diff line number Diff line
@@ -2977,6 +2977,13 @@ public abstract class Phone extends Handler implements PhoneInternalInterface { 
        mCarrierActionAgent.carrierActionReportDefaultNetworkStatus(report);

    }



    /**

     * Action set from carrier signalling broadcast receivers to reset all carrier actions

     */

    public void carrierActionResetAll() {

        mCarrierActionAgent.carrierActionReset();

    }



    /**

     * Notify registrants of a new ringing Connection.

     * Subclasses of Phone probably want to replace this with a

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

+3 −0
Original line number Diff line number Diff line
@@ -257,6 +257,7 @@ public class DcTracker extends Handler { 
                if (DBG) log("Provisioning apn alarm");

                onActionIntentProvisioningApnAlarm(intent);

            } else if (action.equals(CarrierConfigManager.ACTION_CARRIER_CONFIG_CHANGED)) {

                if (DBG) log("received carrier config change");

                if (mIccRecords.get() != null && mIccRecords.get().getRecordsLoaded()) {

                    setDefaultDataRoamingEnabled();

                }
@@ -2539,6 +2540,8 @@ public class DcTracker extends Handler { 
            // for single sim device, update to carrier default if user action is not set

            useCarrierSpecificDefault = true;

        }

        log("setDefaultDataRoamingEnabled: useCarrierSpecificDefault "

                + useCarrierSpecificDefault);

        if (useCarrierSpecificDefault) {

            boolean defaultVal = getDefaultDataRoamingEnabled();

            log("setDefaultDataRoamingEnabled: " + setting + "default value: " + defaultVal);