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

Commit 12aaa4fe authored by Linux Build Service Account's avatar Linux Build Service Account
Browse files

Merge 10449d9a on remote branch 

Change-Id: I4feab9a2f961344a7ed402a89d9255279e62b3f3
parents 5028f4ed 10449d9a

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

+1 −1
Original line number Diff line number Diff line
@@ -80,7 +80,7 @@ public abstract class PhoneBase extends Handler implements Phone { 
    /**

     * Indicates whether Out Of Service is considered as data call disconnect.

     */

    protected static final String PROPERTY_OOS_IS_DISCONNECT = "persist.telephony.oosisdc";

    public static final String PROPERTY_OOS_IS_DISCONNECT = "persist.telephony.oosisdc";



    // Key used to read and write the saved network selection numeric value

    public static final String NETWORK_SELECTION_KEY = "network_selection_key";

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

+9 −2
Original line number Diff line number Diff line
@@ -135,6 +135,13 @@ public class DcTracker extends DcTrackerBase { 
    private static final String PROPERTY_CDMA_ROAMING_IPPROTOCOL = SystemProperties.get(

            "persist.telephony.cdma.rproto", "IP");



    /*

     * Flag that indicates that Out Of Service is considered as data call disconnect

     */

    protected boolean mOosIsDisconnect = SystemProperties.getBoolean(

            PhoneBase.PROPERTY_OOS_IS_DISCONNECT, true);





    private boolean mCanSetPreferApn = false;



    private AtomicBoolean mAttached = new AtomicBoolean(false);
@@ -841,7 +848,7 @@ public class DcTracker extends DcTrackerBase { 
    // Disabled apn's still need avail/unavail notificiations - send them out

    protected void notifyOffApnsOfAvailability(String reason) {

        for (ApnContext apnContext : mApnContexts.values()) {

            if (!mAttached.get() || !apnContext.isReady()) {

            if ((!mAttached.get() && mOosIsDisconnect) || !apnContext.isReady()) {

                if (VDBG) {

                    log("notifyOffApnOfAvailability type:" +

                            apnContext.getDataProfileType());
@@ -2140,7 +2147,7 @@ public class DcTracker extends DcTrackerBase { 
    protected void notifyDataConnection(String reason) {

        if (DBG) log("notifyDataConnection: reason=" + reason);

        for (ApnContext apnContext : mApnContexts.values()) {

            if (mAttached.get() && apnContext.isReady()) {

            if ((mAttached.get() || !mOosIsDisconnect) && apnContext.isReady()) {

                if (DBG) log("notifyDataConnection: type:" + apnContext.getDataProfileType());

                mPhone.notifyDataConnection(reason != null ? reason : apnContext.getReason(),

                        apnContext.getDataProfileType());