Check radio, not ServiceState, for if radio is on.
Cherrypicked from m-wireless-telephony-dev branch.
For E911 calls, pre-empt user WFC settings by always turning on the
radio so we can make a best-effort attempt to complete the call.
Formerly, we checked the ServiceState for STATE_POWER_OFF to indicate
the state of the radio. However, with WFC, the ServiceState could
return IN_SERVICE if connected to a Wifi network when the radio is
powered off because of airplane mode.
Instead, now we check for the radio's power state directly, and power
it on if necessary using the EmergencyCallHelper before attempting
the outgoing call.
Bug: 19151398
Change-Id: I15bac137b402455177ad94e43da7aa18fa3f78c0
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 {