commit e8495bcf33619fd46151e0570eb974e06b1ddbef
author Andrew Lee <anwlee@google.com> Fri Feb 20 19:23:28 2015 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Feb 20 19:23:28 2015 +0000
tree a796c8b8bbcac9ef182230304c9ebe802db01220
parent 1a7ab1a2b221d1bf4a32a3f1dd66baf809995913
parent effef9c35defa7f961f2097ae3a1786ed9463c83

Merge "Update WFC setting summary according to WFC mode." into lmp-mr1-wfc-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 57f40e9..22f21ed 100644
--- a/src/com/android/services/telephony/TelephonyConnectionService.java
+++ b/src/com/android/services/telephony/TelephonyConnectionService.java
@@ -154,7 +154,7 @@
         boolean useEmergencyCallHelper = false;
 
         if (isEmergencyNumber) {
-            if (state == ServiceState.STATE_POWER_OFF) {
+            if (!phone.isRadioOn()) {
                 useEmergencyCallHelper = true;
             }
         } else {