commit 7e8c915162ff7181c83f75a89f284fac9dc67f04
author Etan Cohen <etancohen@google.com> Fri Aug 14 03:18:42 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Fri Aug 14 03:18:42 2015 +0000
tree b1e526f46c9a6f26dfcb3d40f1496dfee4eeaf86
parent 901f9ac9333f02ea6e4ffcab6ff01b03624cd115
parent b9324f26f10f4683f809165fe7e84150c1cd0c3d

am b9324f26: am 188950b4: am 746e32b8: am 5cb43e44: Suport IMS services (SRLTE and non-SRLTE)

* commit 'b9324f26f10f4683f809165fe7e84150c1cd0c3d':
  Suport IMS services (SRLTE and non-SRLTE)

src/com/android/services/telephony/TelephonyConnectionService.java

diff --git a/src/com/android/services/telephony/TelephonyConnectionService.java b/src/com/android/services/telephony/TelephonyConnectionService.java
index fba68d1..cf3759e 100644
--- a/src/com/android/services/telephony/TelephonyConnectionService.java
+++ b/src/com/android/services/telephony/TelephonyConnectionService.java
@@ -217,7 +217,9 @@
         // when voice RAT is OOS but Data RAT is present.
         int state = phone.getServiceState().getState();
         if (state == ServiceState.STATE_OUT_OF_SERVICE) {
-            state = phone.getServiceState().getDataRegState();
+            if (phone.getServiceState().getDataNetworkType() == TelephonyManager.NETWORK_TYPE_LTE) {
+                state = phone.getServiceState().getDataRegState();
+            }
         }
         boolean useEmergencyCallHelper = false;