commit 6cd558c50f7900f85e5be935b21d20b80abbf56c
author Ihab Awad <ihab@google.com> Fri Aug 15 22:59:10 2014 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Aug 15 19:10:34 2014 +0000
tree 61be8fdc6d58593f130bf07811b710f780e246ee
parent e701542cf2a1da0fd5d1c5cf733e10384d9855b6
parent 59eac9b0b93b6c9678c76e3fcecf56b010dadf72

Merge "Fix problems with SIM-less emergency dialing" into lmp-dev

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 bfae89e..04da3e7 100644
--- a/src/com/android/services/telephony/TelephonyConnectionService.java
+++ b/src/com/android/services/telephony/TelephonyConnectionService.java
@@ -93,8 +93,14 @@
                     "Phone is null");
         }
 
-        if (!isEmergencyNumber) {
-            int state = phone.getServiceState().getState();
+        int state = phone.getServiceState().getState();
+        boolean useEmergencyCallHelper = false;
+
+        if (isEmergencyNumber) {
+            if (state == ServiceState.STATE_POWER_OFF) {
+                useEmergencyCallHelper = true;
+            }
+        } else {
             switch (state) {
                 case ServiceState.STATE_IN_SERVICE:
                 case ServiceState.STATE_EMERGENCY_ONLY:
@@ -120,9 +126,7 @@
         connection.setHandle(handle, PhoneConstants.PRESENTATION_ALLOWED);
         connection.setInitializing();
 
-        if (isEmergencyNumber) {
-            Log.d(this, "onCreateOutgoingConnection, doing startTurnOnRadioSequence for " +
-                    "emergency number");
+        if (useEmergencyCallHelper) {
             if (mEmergencyCallHelper == null) {
                 mEmergencyCallHelper = new EmergencyCallHelper(this);
             }