Support RRO for emergency number conversion map
With current implementation, configurable emergency call number map is
read from global shared resources object that provides access to only
system resources(no application resources).
It means RRO(runtime resource overlay) is NOT supported.
This patch also applies refactoring to remove function
isConvertToEmergencyNumberEnabled.
Bug: 37762325
Test: Manual
Change-Id: I7585ced398740696972a79bf5532031c0a630286
diff --git a/src/com/android/phone/EmergencyDialer.java b/src/com/android/phone/EmergencyDialer.java
index 53f6f7e..e7b05ce 100644
--- a/src/com/android/phone/EmergencyDialer.java
+++ b/src/com/android/phone/EmergencyDialer.java
@@ -513,11 +513,12 @@
*/
private void placeCall() {
mLastNumber = mDigits.getText().toString();
- // Convert into emergency number if necessary
- // This is required in some regions (e.g. Taiwan).
- if (PhoneNumberUtils.isConvertToEmergencyNumberEnabled()) {
- mLastNumber = PhoneNumberUtils.convertToEmergencyNumber(mLastNumber);
- }
+
+ // Convert into emergency number according to emergency conversion map.
+ // If conversion map is not defined (this is default), this method does
+ // nothing and just returns input number.
+ mLastNumber = PhoneNumberUtils.convertToEmergencyNumber(this, mLastNumber);
+
if (PhoneNumberUtils.isLocalEmergencyNumber(this, mLastNumber)) {
if (DBG) Log.d(LOG_TAG, "placing call to " + mLastNumber);