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

Commit 351ad88d authored by Pengquan Meng's avatar Pengquan Meng Committed by android-build-merger
Browse files

Merge "Fix to return data connection state" 

am: 940538ef

Change-Id: I07045bf70266af6e998f3de39dfa873bf791d945
parents 8f0fd579 940538ef

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

+1 −1
Original line number Diff line number Diff line
@@ -504,7 +504,7 @@ public class GsmCdmaPhone extends Phone { 


            ret = PhoneConstants.DataState.DISCONNECTED;

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

                && (isPhoneTypeCdma() ||

                && (isPhoneTypeCdma() || isPhoneTypeCdmaLte() ||

                (isPhoneTypeGsm() && !apnType.equals(PhoneConstants.APN_TYPE_EMERGENCY)))) {

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

            // but no data will flow