Merge "Import translations. DO NOT MERGE ANYWHERE" into 24D1-dev
diff --git a/src/com/android/services/telephony/TelephonyConnectionService.java b/src/com/android/services/telephony/TelephonyConnectionService.java
index cf8d55f..81ade13 100644
--- a/src/com/android/services/telephony/TelephonyConnectionService.java
+++ b/src/com/android/services/telephony/TelephonyConnectionService.java
@@ -1189,8 +1189,10 @@
}
if (mDomainSelectionResolver.isDomainSelectionSupported()) {
- // Normal routing emergency number shall be handled by normal call domain selctor.
- int routing = getEmergencyCallRouting(phone, number, needToTurnOnRadio);
+ // Normal routing emergency number shall be handled by normal call domain selector.
+ int routing = (isEmergencyNumber)
+ ? getEmergencyCallRouting(phone, number, needToTurnOnRadio)
+ : EmergencyNumber.EMERGENCY_CALL_ROUTING_UNKNOWN;
if (isEmergencyNumber && routing != EmergencyNumber.EMERGENCY_CALL_ROUTING_NORMAL) {
final Connection resultConnection =
placeEmergencyConnection(phone,
@@ -2932,6 +2934,9 @@
}
private int getEmergencyCallRouting(Phone phone, String number, boolean needToTurnOnRadio) {
+ if (phone == null) {
+ return EmergencyNumber.EMERGENCY_CALL_ROUTING_UNKNOWN;
+ }
// This method shall be called only if AOSP domain selection is enabled.
if (mDynamicRoutingController == null) {
mDynamicRoutingController = DynamicRoutingController.getInstance();