commit 55117cd250b3c76f13fbc5f0a2b76a837a6b6564
author Treehugger Robot <treehugger-gerrit@google.com> Fri Dec 07 06:23:10 2018 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Dec 07 06:23:10 2018 +0000
tree 826445c0bdebeca6e11578f4c15fe7312005325e
parent 1c5689ba4a4c41f38b58349d0982744243f0ff19
parent f90862eea20ebe59714144fb6f35d3bec8976b3e

Merge "Can't dial Emergency call when user turn on airplane mode."

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 f986994..8ae7b8a 100644
--- a/src/com/android/services/telephony/TelephonyConnectionService.java
+++ b/src/com/android/services/telephony/TelephonyConnectionService.java
@@ -433,7 +433,7 @@
                         // been powered on and isn't in the UNAVAILABLE state, even if it is
                         // reporting the OUT_OF_SERVICE state.
                         return (phone.getState() == PhoneConstants.State.OFFHOOK)
-                            || phone.getServiceStateTracker().isRadioOn();
+                            || phone.getServiceState().getState() != ServiceState.STATE_POWER_OFF;
                     } else {
                         // It is not an emergency number, so wait until we are in service and ready
                         // to make calls. This can happen when we power down the radio on bluetooth