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

Commit 100e94af authored by chen xu's avatar chen xu
Browse files

support vzw roaming default on 

1. sms link handling by defaultcarrierapp under restricted NW
2. support launching defaultcarrierapp from carrier notification to
load captive portal page.
2. new carrier action to reset all actions

Bug: 113114222
Change-Id: I16029e4401a8dd700581406f0284bda80c106df1
parent 67f3a783

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

+1 −1
Original line number Diff line number Diff line
@@ -217,7 +217,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
@@ -2855,6 +2855,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
@@ -248,6 +248,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();

                }
@@ -2714,6 +2715,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);