commit 940538ef3780ee687c767693ffde9000ea1ddff6
author Pengquan Meng <mpq@google.com> Fri Sep 22 20:59:41 2017 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Sep 22 20:59:41 2017 +0000
tree 363577380d06b20573fe1d60c79d824ba61713f8
parent 736138c72fc9be2e3651c063afec2b9bea3d4c65
parent bbd1c7e7cf9a446a73d87f5a733289cb18378e78

Merge "Fix to return data connection state"

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

diff --git a/src/java/com/android/internal/telephony/GsmCdmaPhone.java b/src/java/com/android/internal/telephony/GsmCdmaPhone.java
index 3344da6..0c34749 100644
--- a/src/java/com/android/internal/telephony/GsmCdmaPhone.java
+++ b/src/java/com/android/internal/telephony/GsmCdmaPhone.java
@@ -502,7 +502,7 @@
 
             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