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

Commit 599b1029 authored by Wink Saville's avatar Wink Saville Committed by Android Git Automerger
Browse files

am 2d8500d2: am 799f04c0: Merge "Report data status from ApnContext even if... 

am 2d8500d2: am 799f04c0: Merge "Report data status from ApnContext even if data is detached" into honeycomb-LTE

* commit '2d8500d2':
  Report data status from ApnContext even if data is detached
parents 62bd659a 2d8500d2

telephony/java/com/android/internal/telephony/cdma/CDMALTEPhone.java

+2 −22
Original line number Diff line number Diff line
@@ -65,32 +65,12 @@ public class CDMALTEPhone extends CDMAPhone { 


    @Override

    public DataState getDataConnectionState(String apnType) {

        // TODO: Remove instanceof if possible.

        boolean isCdmaDataConnectionTracker = false;

        if (mDataConnectionTracker instanceof CdmaDataConnectionTracker) {

            log("getDataConnectionState isCdmaDataConnectionTracker");

            isCdmaDataConnectionTracker = true;

        } else {

            log("getDataConnectionState NOT CdmaDataConnectionTracker");

        }

        DataState ret = DataState.DISCONNECTED;



        if (!isCdmaDataConnectionTracker && (SystemProperties.get("adb.connected", "").length()

                > 0)) {

            // We're connected to an ADB host and we have USB networking

            // turned on. No matter what the radio state is,

            // we report data connected



            ret = DataState.CONNECTED;

        } else if (mSST == null) {

        if (mSST == null) {

            // Radio Technology Change is ongoning, dispose() and

            // removeReferences() have

            // already been called

            // removeReferences() have already been called



            ret = DataState.DISCONNECTED;

        } else if (mSST.getCurrentDataConnectionState() != ServiceState.STATE_IN_SERVICE) {

            // If we're out of service, open TCP sockets may still work

            // but no data will flow

            ret = DataState.DISCONNECTED;

        } else if (mDataConnectionTracker.isApnTypeEnabled(apnType) == false) {

            ret = DataState.DISCONNECTED;

telephony/java/com/android/internal/telephony/gsm/GSMPhone.java

+3 −0
Original line number Diff line number Diff line
@@ -301,6 +301,9 @@ public class GSMPhone extends PhoneBase { 
            ret = DataState.DISCONNECTED;

        } else if (mDataConnectionTracker.isApnTypeEnabled(apnType) == false ||

                mDataConnectionTracker.isApnTypeActive(apnType) == false) {

            //TODO: isApnTypeActive() is just checking whether ApnContext holds

            //      Dataconnection or not. Checking each ApnState below should

            //      provide the same state. Calling isApnTypeActive() can be removed.

            ret = DataState.DISCONNECTED;

        } else { /* mSST.gprsState == ServiceState.STATE_IN_SERVICE */

            switch (mDataConnectionTracker.getState(apnType)) {